Skip to content

Commit

Permalink
Organize imports and format according to Apache Felix code conventions
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@657742 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Felix Meschberger committed May 19, 2008
1 parent d388623 commit edfad55
Show file tree
Hide file tree
Showing 36 changed files with 3,181 additions and 2,233 deletions.
16 changes: 11 additions & 5 deletions webconsole/src/main/java/org/apache/felix/webconsole/Action.java
View file
Expand Up @@ -16,26 +16,32 @@
*/
package org.apache.felix.webconsole;


import java.io.IOException;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

public interface Action {

public interface Action
{

static final String SERVICE = Action.class.getName();

/**
* The name of a request attribute, which may be set by performAction if
* redirecting.
*/
static final String ATTR_REDIRECT_PARAMETERS= "redirectParameters";
static final String ATTR_REDIRECT_PARAMETERS = "redirectParameters";


String getName();


String getLabel();


/**
* Performs the action the request data optionally sending a response to
* the HTTP Servlet Response.
Expand All @@ -53,7 +59,7 @@ public interface Action {
* processing the action. The <code>rootCause</code> of the exception
* should contain the cause of the error.
*/
boolean performAction(HttpServletRequest request,
HttpServletResponse response) throws IOException, ServletException;
boolean performAction( HttpServletRequest request, HttpServletResponse response ) throws IOException,
ServletException;

}
9 changes: 7 additions & 2 deletions webconsole/src/main/java/org/apache/felix/webconsole/ConfigurationPrinter.java
View file
Expand Up @@ -18,14 +18,19 @@
*/
package org.apache.felix.webconsole;


import java.io.PrintWriter;

public interface ConfigurationPrinter {

public interface ConfigurationPrinter
{

static final String SERVICE = ConfigurationPrinter.class.getName();


String getTitle();

void printConfiguration(PrintWriter printWriter);

void printConfiguration( PrintWriter printWriter );

}
10 changes: 8 additions & 2 deletions webconsole/src/main/java/org/apache/felix/webconsole/Render.java
View file
Expand Up @@ -16,23 +16,29 @@
*/
package org.apache.felix.webconsole;


import java.io.IOException;

import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;


/**
* The <code>Render</code> TODO
*/
public interface Render {
public interface Render
{

static final String SERVICE = Render.class.getName();


String getName();


String getLabel();

void render(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException;

void render( HttpServletRequest request, HttpServletResponse response ) throws ServletException, IOException;

}
56 changes: 36 additions & 20 deletions webconsole/src/main/java/org/apache/felix/webconsole/internal/BaseManagementPlugin.java
View file
Expand Up @@ -18,13 +18,16 @@
*/
package org.apache.felix.webconsole.internal;


import org.apache.felix.webconsole.internal.servlet.Logger;
import org.osgi.framework.BundleContext;
import org.osgi.service.packageadmin.PackageAdmin;
import org.osgi.service.startlevel.StartLevel;
import org.osgi.util.tracker.ServiceTracker;

public class BaseManagementPlugin {

public class BaseManagementPlugin
{

private BundleContext bundleContext;
private Logger log;
Expand All @@ -33,42 +36,55 @@ public class BaseManagementPlugin {

private ServiceTracker packageAdmin;

protected BaseManagementPlugin() {

protected BaseManagementPlugin()
{
}

public void setBundleContext(BundleContext bundleContext) {

public void setBundleContext( BundleContext bundleContext )
{
this.bundleContext = bundleContext;
}

public void setLogger(Logger log) {


public void setLogger( Logger log )
{
this.log = log;
}

protected BundleContext getBundleContext() {

protected BundleContext getBundleContext()
{
return bundleContext;
}

protected Logger getLog() {


protected Logger getLog()
{
return log;
}

protected StartLevel getStartLevel() {
if (startLevelService == null) {
startLevelService = new ServiceTracker(getBundleContext(),
StartLevel.class.getName(), null);


protected StartLevel getStartLevel()
{
if ( startLevelService == null )
{
startLevelService = new ServiceTracker( getBundleContext(), StartLevel.class.getName(), null );
startLevelService.open();
}
return (StartLevel) startLevelService.getService();
return ( StartLevel ) startLevelService.getService();
}

protected PackageAdmin getPackageAdmin() {
if (packageAdmin == null) {
packageAdmin = new ServiceTracker(getBundleContext(),
PackageAdmin.class.getName(), null);

protected PackageAdmin getPackageAdmin()
{
if ( packageAdmin == null )
{
packageAdmin = new ServiceTracker( getBundleContext(), PackageAdmin.class.getName(), null );
packageAdmin.open();
}
return (PackageAdmin) packageAdmin.getService();
return ( PackageAdmin ) packageAdmin.getService();
}


}
20 changes: 14 additions & 6 deletions webconsole/src/main/java/org/apache/felix/webconsole/internal/OsgiManagerActivator.java
View file
Expand Up @@ -18,20 +18,28 @@
*/
package org.apache.felix.webconsole.internal;


import org.apache.felix.webconsole.internal.servlet.OsgiManager;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;

public class OsgiManagerActivator implements BundleActivator {

public class OsgiManagerActivator implements BundleActivator
{

private OsgiManager osgiManager;

public void start(BundleContext bundleContext) {
osgiManager = new OsgiManager(bundleContext);


public void start( BundleContext bundleContext )
{
osgiManager = new OsgiManager( bundleContext );
}

public void stop(BundleContext arg0) {
if (osgiManager != null) {

public void stop( BundleContext arg0 )
{
if ( osgiManager != null )
{
osgiManager.dispose();
}
}
Expand Down
114 changes: 70 additions & 44 deletions webconsole/src/main/java/org/apache/felix/webconsole/internal/Util.java
View file
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.felix.webconsole.internal;


import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
Expand All @@ -30,10 +31,12 @@
import org.apache.commons.io.IOUtils;
import org.apache.felix.webconsole.Render;


/**
* The <code>Util</code> TODO
*/
public class Util {
public class Util
{

/** web apps subpage */
public static final String PAGE_WEBAPPS = "/webapps";
Expand Down Expand Up @@ -87,8 +90,10 @@ public class Util {
/** The name of the request attribute containig the map of FileItems from the POST request */
public static final String ATTR_FILEUPLOAD = "org.apache.felix.webconsole.fileupload";

public static PrintWriter startHtml(HttpServletResponse resp, String pageTitle) throws IOException {
resp.setContentType("text/html; utf-8");

public static PrintWriter startHtml( HttpServletResponse resp, String pageTitle ) throws IOException
{
resp.setContentType( "text/html; utf-8" );

PrintWriter pw = resp.getWriter();

Expand All @@ -102,69 +107,90 @@ public static PrintWriter startHtml(HttpServletResponse resp, String pageTitle)
long totalMem = Runtime.getRuntime().totalMemory() / 1024;
long usedMem = totalMem - freeMem;

String header = MessageFormat.format(HEADER, new Object[] {
adminTitle,
"1.0.0-SNAPSHOT", // ServletEngine.VERSION.getFullVersion(),
System.getProperty("java.runtime.version"),
System.getProperty("java.runtime.name"),
System.getProperty("java.vm.name"),
System.getProperty("java.vm.version"),
System.getProperty("java.vm.info"), new Long(totalMem),
new Long(usedMem), new Long(freeMem), vendorWeb, productName,
pageTitle, productWeb, vendorName});
pw.println(header);
String header = MessageFormat.format( HEADER, new Object[]
{
adminTitle,
"1.0.0-SNAPSHOT", // ServletEngine.VERSION.getFullVersion(),
System.getProperty( "java.runtime.version" ), System.getProperty( "java.runtime.name" ),
System.getProperty( "java.vm.name" ), System.getProperty( "java.vm.version" ),
System.getProperty( "java.vm.info" ), new Long( totalMem ), new Long( usedMem ), new Long( freeMem ),
vendorWeb, productName, pageTitle, productWeb, vendorName } );
pw.println( header );
return pw;
}

public static void navigation(PrintWriter pw, Collection renders, String current, boolean disabled) {
pw.println("<p id='technav'>");

public static void navigation( PrintWriter pw, Collection renders, String current, boolean disabled )
{
pw.println( "<p id='technav'>" );

SortedMap map = new TreeMap();
for (Iterator ri=renders.iterator(); ri.hasNext(); ) {
Render render = (Render) ri.next();
if (render.getLabel() == null) {
for ( Iterator ri = renders.iterator(); ri.hasNext(); )
{
Render render = ( Render ) ri.next();
if ( render.getLabel() == null )
{
// ignore renders without a label
} else if (disabled || current.equals(render.getName())) {
map.put(render.getLabel(), "<span class='technavat'>" + render.getLabel() + "</span>");
} else {
map.put(render.getLabel(), "<a href='" + render.getName() + "'>" + render.getLabel() + "</a></li>");
}
else if ( disabled || current.equals( render.getName() ) )
{
map.put( render.getLabel(), "<span class='technavat'>" + render.getLabel() + "</span>" );
}
else
{
map.put( render.getLabel(), "<a href='" + render.getName() + "'>" + render.getLabel() + "</a></li>" );
}
}

for (Iterator li=map.values().iterator(); li.hasNext(); ) {
pw.println(li.next());
for ( Iterator li = map.values().iterator(); li.hasNext(); )
{
pw.println( li.next() );
}

pw.println("</p>");
pw.println( "</p>" );
}

public static void endHhtml(PrintWriter pw) {
pw.println("</body>");
pw.println("</html>");

public static void endHhtml( PrintWriter pw )
{
pw.println( "</body>" );
pw.println( "</html>" );
}

public static void startScript(PrintWriter pw) {
pw.println("<script type='text/javascript'>");
pw.println("// <![CDATA[");

public static void startScript( PrintWriter pw )
{
pw.println( "<script type='text/javascript'>" );
pw.println( "// <![CDATA[" );
}

public static void endScript(PrintWriter pw) {
pw.println("// ]]>");
pw.println("</script>");

public static void endScript( PrintWriter pw )
{
pw.println( "// ]]>" );
pw.println( "</script>" );
}

public static void spool(String res, HttpServletResponse resp) throws IOException {
InputStream ins = getResource(res);
if (ins != null) {
try {
IOUtils.copy(ins, resp.getOutputStream());
} finally {
IOUtils.closeQuietly(ins);

public static void spool( String res, HttpServletResponse resp ) throws IOException
{
InputStream ins = getResource( res );
if ( ins != null )
{
try
{
IOUtils.copy( ins, resp.getOutputStream() );
}
finally
{
IOUtils.closeQuietly( ins );
}
}
}

private static InputStream getResource(String resource) {
return Util.class.getResourceAsStream(resource);

private static InputStream getResource( String resource )
{
return Util.class.getResourceAsStream( resource );
}
}

0 comments on commit edfad55

Please sign in to comment.