You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2013/04/19 22:33:44 UTC
svn commit: r1470029 - in
/felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl:
AbstractWebConsolePlugin.java DefaultWebConsolePlugin.java
InventoryPrinterAdapter.java webconsole/WebConsoleAdapter.java
Author: fmeschbe
Date: Fri Apr 19 20:33:43 2013
New Revision: 1470029
URL: http://svn.apache.org/r1470029
Log:
FELIX-4025 Cleanup InventoryPrinter API
- and of course the implementation fixes required for ZipAttachmentPrinter
method argument rearrangement
Modified:
felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/AbstractWebConsolePlugin.java
felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/DefaultWebConsolePlugin.java
felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/InventoryPrinterAdapter.java
felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/webconsole/WebConsoleAdapter.java
Modified: felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/AbstractWebConsolePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/AbstractWebConsolePlugin.java?rev=1470029&r1=1470028&r2=1470029&view=diff
==============================================================================
--- felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/AbstractWebConsolePlugin.java (original)
+++ felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/AbstractWebConsolePlugin.java Fri Apr 19 20:33:43 2013
@@ -647,7 +647,7 @@ public abstract class AbstractWebConsole
flush();
zip.closeEntry();
- handler.addAttachments(handler.getName().concat("/"), this.zip);
+ handler.addAttachments(this.zip, handler.getName().concat("/"));
}
else if (format == Format.JSON)
{
@@ -661,7 +661,7 @@ public abstract class AbstractWebConsole
zip.closeEntry();
if (!handler.supports(Format.TEXT))
{
- handler.addAttachments(handler.getName().concat("/"), this.zip);
+ handler.addAttachments(this.zip, handler.getName().concat("/"));
}
}
}
Modified: felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/DefaultWebConsolePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/DefaultWebConsolePlugin.java?rev=1470029&r1=1470028&r2=1470029&view=diff
==============================================================================
--- felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/DefaultWebConsolePlugin.java (original)
+++ felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/DefaultWebConsolePlugin.java Fri Apr 19 20:33:43 2013
@@ -97,10 +97,10 @@ public class DefaultWebConsolePlugin ext
}
/**
- * @see org.apache.felix.inventory.ZipAttachmentProvider#addAttachments(java.lang.String,
- * java.util.zip.ZipOutputStream)
+ * @see org.apache.felix.inventory.ZipAttachmentProvider#addAttachments(java.util.zip.ZipOutputStream,
+ * java.lang.String)
*/
- public void addAttachments(String namePrefix, ZipOutputStream zos) throws IOException
+ public void addAttachments(ZipOutputStream zos, String namePrefix) throws IOException
{
// no attachments support
}
Modified: felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/InventoryPrinterAdapter.java
URL: http://svn.apache.org/viewvc/felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/InventoryPrinterAdapter.java?rev=1470029&r1=1470028&r2=1470029&view=diff
==============================================================================
--- felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/InventoryPrinterAdapter.java (original)
+++ felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/InventoryPrinterAdapter.java Fri Apr 19 20:33:43 2013
@@ -119,14 +119,14 @@ public class InventoryPrinterAdapter imp
}
/**
- * @see org.apache.felix.inventory.ZipAttachmentProvider#addAttachments(java.lang.String,
- * java.util.zip.ZipOutputStream)
+ * @see org.apache.felix.inventory.ZipAttachmentProvider#addAttachments(java.util.zip.ZipOutputStream,
+ * java.lang.String)
*/
- public void addAttachments(final String namePrefix, final ZipOutputStream zos) throws IOException
+ public void addAttachments(final ZipOutputStream zos, final String namePrefix) throws IOException
{
if (printer instanceof ZipAttachmentProvider)
{
- ((ZipAttachmentProvider) printer).addAttachments(namePrefix, zos);
+ ((ZipAttachmentProvider) printer).addAttachments(zos, namePrefix);
}
}
Modified: felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/webconsole/WebConsoleAdapter.java
URL: http://svn.apache.org/viewvc/felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/webconsole/WebConsoleAdapter.java?rev=1470029&r1=1470028&r2=1470029&view=diff
==============================================================================
--- felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/webconsole/WebConsoleAdapter.java (original)
+++ felix/trunk/inventory/src/main/java/org/apache/felix/inventory/impl/webconsole/WebConsoleAdapter.java Fri Apr 19 20:33:43 2013
@@ -217,10 +217,10 @@ public class WebConsoleAdapter implement
}
/**
- * @see org.apache.felix.inventory.ZipAttachmentProvider#addAttachments(java.lang.String,
- * java.util.zip.ZipOutputStream)
+ * @see org.apache.felix.inventory.ZipAttachmentProvider#addAttachments(java.util.zip.ZipOutputStream,
+ * java.lang.String)
*/
- public void addAttachments(final String namePrefix, final ZipOutputStream zos) throws IOException
+ public void addAttachments(final ZipOutputStream zos, final String namePrefix) throws IOException
{
final URL[] attachments = cpa.getAttachments();
if (attachments != null)