More improvements on code style and compiler warnings
diff --git a/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/wizards/ConvertProjectsToBundlesWizardPage.java b/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/wizards/ConvertProjectsToBundlesWizardPage.java
index 4a4329a..1ce466f 100644
--- a/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/wizards/ConvertProjectsToBundlesWizardPage.java
+++ b/plugins/org.eclipse.libra.facet.ui/src/org/eclipse/libra/facet/ui/wizards/ConvertProjectsToBundlesWizardPage.java
@@ -87,8 +87,8 @@
 		}

 	}

 

-	IObservableSet fUnconverted;

-	IObservableSet fSelected;

+	IObservableSet<IProject> fUnconverted;

+	IObservableSet<IProject> fSelected;

 

 	public ConvertProjectsToBundlesWizardPage(IProject[] unconverted, IProject[] selected) {

 		super("converToWAB"); //$NON-NLS-1$

@@ -96,8 +96,8 @@
 		setTitle(Messages.ConvertProjectsToBundlesWizardPage_Title);

 		setDescription(Messages.ConvertProjectsToBundlesWizardPage_Description);

 		

-		this.fUnconverted = new WritableSet(Arrays.asList(unconverted), IProject.class);

-		this.fSelected = new WritableSet(Arrays.asList(selected), IProject.class);

+		this.fUnconverted = new WritableSet<IProject>(Arrays.asList(unconverted), IProject.class);

+		this.fSelected = new WritableSet<IProject>(Arrays.asList(selected), IProject.class);

 	}

 

 	public void createControl(Composite parent) {

@@ -112,7 +112,7 @@
 	}

 

 	public IProject[] getProjects() {

-		return (IProject[]) fSelected.toArray(new IProject[fSelected.size()]);

+		return fSelected.toArray(new IProject[fSelected.size()]);

 	}

 

 	private void createProjectsViewer(Composite parent) {

@@ -170,9 +170,10 @@
 		

 		Label selectedCountLabel = new Label(buttonGroup, SWT.WRAP);

 		GridDataFactory.swtDefaults().align(SWT.FILL, SWT.BOTTOM).grab(false, true).applyTo(selectedCountLabel);

-		dbc.bindValue(SWTObservables.observeText(selectedCountLabel), new ComputedValue(String.class) {

+		dbc.bindValue(SWTObservables.observeText(selectedCountLabel), new ComputedValue<String>(String.class) {

+			@SuppressWarnings("boxing")
 			@Override

-			protected Object calculate() {

+			protected String calculate() {

 				return NLS.bind(Messages.ConvertProjectsToBundlesWizardPage_SelectionCounter, fSelected.size(), fUnconverted.size());

 			}

 		});

diff --git a/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetEventHandler.java b/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetEventHandler.java
index 0111e61..c3d159c 100644
--- a/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetEventHandler.java
+++ b/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetEventHandler.java
@@ -47,16 +47,14 @@
 			
 			// remove the javax.persistence package import, if it already exists
 			ArrayList<IPackageImportDescription> imports = new ArrayList<IPackageImportDescription>();
-			if (imports != null) {
-				imports.addAll(Arrays.asList(bundleProjectDescription.getPackageImports()));
-				
-				for (IPackageImportDescription imp : imports) {
-					if (JAVAX_PERSISTENCE_PACKAGE.equals(imp.getName())) {
-						imports.remove(imp);
-						break;
-					}
+			imports.addAll(Arrays.asList(bundleProjectDescription.getPackageImports()));
+			
+			for (IPackageImportDescription imp : imports) {
+				if (JAVAX_PERSISTENCE_PACKAGE.equals(imp.getName())) {
+					imports.remove(imp);
+					break;
 				}
-			}

+			}
 			
 			// add the javax.persistence package import
 			IPackageImportDescription imp = bundleProjectService.newPackageImport(String.format(JAVAX_PERSISTENCE_PACKAGE, fv.getVersionString()), null, false);
diff --git a/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetInstallConfig.java b/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetInstallConfig.java
index 74bf4a2..9e2ce1f 100644
--- a/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetInstallConfig.java
+++ b/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetInstallConfig.java
@@ -38,10 +38,10 @@
 	

 	private static final String QUALIFIER = "qualifier"; //$NON-NLS-1$

 

-	private IObservableValue symbolicNameValue;

-	private IObservableValue versionValue;

-	private IObservableValue nameValue;

-	private IObservableValue vendorValue;
+	private IObservableValue<String> symbolicNameValue;

+	private IObservableValue<String> versionValue;

+	private IObservableValue<String> nameValue;

+	private IObservableValue<String> vendorValue;
 	
 	private Map<String, String> headers;

 	

@@ -50,42 +50,42 @@
 		
 		headers = new HashMap<String, String>();

 		

-		symbolicNameValue = new WritableValue(realm, getDefaultSymbolicName(), String.class);

-		versionValue = new WritableValue(realm, getDefaultVersion(), String.class);

-		nameValue = new WritableValue(realm, getDefaultSymbolicName(), String.class);

-		vendorValue = new WritableValue(realm, getDefaultVendor(), String.class);

+		symbolicNameValue = new WritableValue<String>(realm, getDefaultSymbolicName(), String.class);

+		versionValue = new WritableValue<String>(realm, getDefaultVersion(), String.class);

+		nameValue = new WritableValue<String>(realm, getDefaultSymbolicName(), String.class);

+		vendorValue = new WritableValue<String>(realm, getDefaultVendor(), String.class);

 	}

 	

-	public IObservableValue getSymbolicNameValue() {

+	public IObservableValue<String> getSymbolicNameValue() {

 		return symbolicNameValue;

 	}

 

-	public IObservableValue getVersionValue() {

+	public IObservableValue<String> getVersionValue() {

 		return versionValue;

 	}

 

-	public IObservableValue getNameValue() {

+	public IObservableValue<String> getNameValue() {

 		return nameValue;

 	}

 

-	public IObservableValue getVendorValue() {

+	public IObservableValue<String> getVendorValue() {

 		return vendorValue;

 	}

 

 	public String getSymbolicName() {

-		return (String) getSymbolicNameValue().getValue();

+		return getSymbolicNameValue().getValue();

 	}

 

 	public Version getVersion() {

-		return Version.parseVersion((String) getVersionValue().getValue());

+		return Version.parseVersion(getVersionValue().getValue());

 	}

 

 	public String getName() {

-		return (String) getNameValue().getValue();

+		return getNameValue().getValue();

 	}

 

 	public String getVendor() {

-		return (String) getVendorValue().getValue();

+		return getVendorValue().getValue();

 	}
 
 	public Map<String, String> getHeaders() {
@@ -141,7 +141,7 @@
 		vendorValue.setValue(getDefaultVendor());

 	}

 

-	private Object getDefaultSymbolicName() {

+	private String getDefaultSymbolicName() {

 		String symbolicName = null;

 		
 		// check if there any existing manifest headers
@@ -174,7 +174,7 @@
 		return version;

 	}

 

-	private Object getDefaultName() {

+	private String getDefaultName() {

 		String bundleName = null;
 		
 		// check if there any existing manifest headers
@@ -197,7 +197,7 @@
 		return bundleName;

 	}

 

-	private Object getDefaultVendor() {

+	private String getDefaultVendor() {

 		String vendor = null;

 		

 		// check if there any existing manifest headers
diff --git a/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetInstallDelegate.java b/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetInstallDelegate.java
index bd51949..1f8d966 100644
--- a/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetInstallDelegate.java
+++ b/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetInstallDelegate.java
@@ -80,7 +80,7 @@
 		doExecute(project, config, monitor);

 	}

 	

-	private void doExecute(IProject project,

+	private static void doExecute(IProject project,

 			OSGiBundleFacetInstallConfig config, IProgressMonitor monitor)

 			throws CoreException {

 		setBundleRoot(project);

@@ -104,7 +104,7 @@
 		}

 	}

 	

-	private void createBundleProjectDescription(IProject project,

+	private static void createBundleProjectDescription(IProject project,

 			OSGiBundleFacetInstallConfig config, IProgressMonitor monitor)

 			throws CoreException {

 		IBundleProjectDescription bundleProjectDescription = getBundleProjectDescription(project);

diff --git a/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetUninstallConfig.java b/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetUninstallConfig.java
index 1308c35..3ee3779 100644
--- a/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetUninstallConfig.java
+++ b/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetUninstallConfig.java
@@ -10,6 +10,8 @@
  *******************************************************************************/
 package org.eclipse.libra.facet;

 

+import java.util.ArrayList;
+
 import org.eclipse.core.databinding.observable.Realm;

 import org.eclipse.core.databinding.observable.value.SelectObservableValue;

 import org.eclipse.core.databinding.observable.value.WritableValue;

@@ -17,36 +19,41 @@
 

 public class OSGiBundleFacetUninstallConfig extends ActionConfig {

 	

-	private SelectObservableValue strategyValue;

-	private WritableValue[] optionValues;

+	private SelectObservableValue<OSGiBundleFacetUninstallStrategy> strategyValue;

+	private ArrayList<WritableValue<Boolean>> optionValues;

 	

 	public OSGiBundleFacetUninstallConfig() {

 		Realm realm = OSGiBundleFacetRealm.getRealm();

 		

-		strategyValue = new SelectObservableValue(realm, OSGiBundleFacetUninstallStrategy.class);

-		optionValues = new WritableValue[OSGiBundleFacetUninstallStrategy.values().length];

-		for (int i = 0; i < optionValues.length; i++) {

-			optionValues[i] = new WritableValue(realm, null, Boolean.class);

-			strategyValue.addOption(OSGiBundleFacetUninstallStrategy.values()[i], optionValues[i]);

+		strategyValue = new SelectObservableValue<OSGiBundleFacetUninstallStrategy>(realm, OSGiBundleFacetUninstallStrategy.class);
+		
+		final OSGiBundleFacetUninstallStrategy[] values = OSGiBundleFacetUninstallStrategy.values();
+		

+		optionValues =  new ArrayList<WritableValue<Boolean>>(values.length);

+		for (int i = 0; i < values.length; i++) {
+			final WritableValue<Boolean> wv = new WritableValue<Boolean>(realm, null, Boolean.class);

+			optionValues.set(i, wv);

+			strategyValue.addOption(OSGiBundleFacetUninstallStrategy.values()[i], wv);

 		}

 		

 		strategyValue.setValue(OSGiBundleFacetUninstallStrategy.defaultStrategy());

 	}

 

-	public SelectObservableValue getStrategyValue() {

+	public SelectObservableValue<OSGiBundleFacetUninstallStrategy> getStrategyValue() {

 		return strategyValue;

 	}

 	

 	public OSGiBundleFacetUninstallStrategy getStrategy() {

-		return (OSGiBundleFacetUninstallStrategy) strategyValue.getValue();

+		return strategyValue.getValue();

 	}

 	

 	public void setStrategy(OSGiBundleFacetUninstallStrategy strategy) {

 		strategyValue.setValue(strategy);

 	}

 	

+	@SuppressWarnings("rawtypes")
 	public WritableValue[] getOptionValues() {

-		return optionValues.clone();

+		return optionValues.toArray(new WritableValue[0]);

 	}

 	

 }

diff --git a/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetUninstallDelegate.java b/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetUninstallDelegate.java
index f9bb686..bcd4b5e 100644
--- a/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetUninstallDelegate.java
+++ b/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/OSGiBundleFacetUninstallDelegate.java
@@ -62,7 +62,7 @@
 		}

 	}

 

-	private void removePluginNature(IProject project, IProgressMonitor monitor) throws CoreException {
+	private static void removePluginNature(IProject project, IProgressMonitor monitor) throws CoreException {
 		IProjectDescription description = project.getDescription();

 		if (description.hasNature(IBundleProjectDescription.PLUGIN_NATURE)) {
 			String[] natures = description.getNatureIds();
@@ -84,7 +84,7 @@
 	}

 	
 	// workaround - see bug 344720

-	private void removeFromBuildSpec(IProjectDescription description, String builderId) {
+	private static void removeFromBuildSpec(IProjectDescription description, String builderId) {
 		ICommand[] commands = description.getBuildSpec();
 		for (int i = 0; i < commands.length; ++i) {
 			if (commands[i].getBuilderName().equals(builderId)) {
@@ -97,7 +97,7 @@
 		}
 	}
 
-	private void removeRequiredBundlesClasspathContainer(IProject project, IProgressMonitor monitor) throws CoreException {

+	private static void removeRequiredBundlesClasspathContainer(IProject project, IProgressMonitor monitor) throws CoreException {

 		if (isJavaProject(project)) {

 			IJavaProject javaProject = JavaCore.create(project);

 			IClasspathEntry[] entries = javaProject.getRawClasspath();

@@ -115,12 +115,12 @@
 		}

 	}

 

-	private void deleteBuildProperties(IProject project, IProgressMonitor monitor) throws CoreException {

+	private static void deleteBuildProperties(IProject project, IProgressMonitor monitor) throws CoreException {

 		IResource buildPropertiesFile = findResource(project, BUILD_PROPERTIES);

 		buildPropertiesFile.delete(IResource.KEEP_HISTORY, monitor);

 	}

 	

-	private void cleanUpManifest(IProject project, IProgressMonitor monitor) throws CoreException {

+	private static void cleanUpManifest(IProject project, IProgressMonitor monitor) throws CoreException {

 		IResource manifestFile = findResource(project, MANIFEST_URI);

 		manifestFile.delete(IResource.KEEP_HISTORY, monitor);

 		

@@ -131,7 +131,7 @@
 		}

 	}

 	

-	private IResource findResource(IProject project, String memberURI) throws CoreException {

+	private static IResource findResource(IProject project, String memberURI) throws CoreException {

 		IBundleProjectDescription bundleProjectDescription = getBundleProjectDescription(project);

 		IPath bundleRoot = bundleProjectDescription.getBundleRoot();

 		IPath memberPath = bundleRoot;

diff --git a/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/internal/WebContextRootSynchonizer.java b/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/internal/WebContextRootSynchonizer.java
index 25d4dd6..e6ae65e 100644
--- a/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/internal/WebContextRootSynchonizer.java
+++ b/plugins/org.eclipse.libra.facet/src/org/eclipse/libra/facet/internal/WebContextRootSynchonizer.java
@@ -132,7 +132,7 @@
         }

 	}

 

-	private boolean isWAB(IProject project) {

+	private static boolean isWAB(IProject project) {

 		boolean result = false;

     	try {

 			result = isWebApplicationBundle(project);

@@ -143,7 +143,7 @@
     	return result;

 	}

 	

-	private boolean isContentChanged(IResourceDelta delta) {

+	private static boolean isContentChanged(IResourceDelta delta) {

 		return delta != null && delta.getKind() == IResourceDelta.CHANGED

 				&& (delta.getFlags() & IResourceDelta.CONTENT) != 0;

 	}

diff --git a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceConfiguration.java b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceConfiguration.java
index 077aa99..3e2a406 100644
--- a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceConfiguration.java
+++ b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceConfiguration.java
@@ -56,6 +56,7 @@
 		try {
 			loadTarget();
 		} catch (CoreException e) {
+			e.printStackTrace();
 		}
 		return targetDefinition;
 	}
@@ -77,9 +78,6 @@
 		} else {
 			loadTarget();
 		}
-
-
-
 	}
 
 	private ITargetDefinition loadTarget() throws CoreException {
@@ -156,9 +154,9 @@
 		load(path, monitor);
 	}
 
-	public void load(IPath path, IProgressMonitor monitor) throws CoreException {
+	public void load(IPath path, IProgressMonitor monitorP) throws CoreException {
 		try {
-			monitor = ProgressUtil.getMonitorFor(monitor);
+			IProgressMonitor monitor = ProgressUtil.getMonitorFor(monitorP);
 			monitor.beginTask(Messages.loadingTask, 7);
 
 			// InputStream in = new
@@ -198,7 +196,7 @@
 	 */
 	protected void save(IPath path, boolean forceDirty, IProgressMonitor monitor)
 			throws CoreException {
-
+		// TODO Frameworkinstance.save() no implementation - ?
 	}
 
 	/**
@@ -226,6 +224,7 @@
 	 */
 	public void save(IFolder folder, IProgressMonitor monitor)
 			throws CoreException {
+		// TODO Frameworkinstance.save() no implementation - ?
 	}
 
 	/**
diff --git a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceDelegate.java b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceDelegate.java
index 462fb28..3e750c6 100644
--- a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceDelegate.java
+++ b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/FrameworkInstanceDelegate.java
@@ -287,7 +287,7 @@
 		try{
 			port =  Integer.parseInt(portNo);
 		}finally{
-		
+			// let exceptions be thrown
 		}
 		return port;
 	}
diff --git a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/module/OsgiModuleDeployableFactory.java b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/module/OsgiModuleDeployableFactory.java
index b8cc622..aa315c6 100644
--- a/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/module/OsgiModuleDeployableFactory.java
+++ b/plugins/org.eclipse.libra.framework.core/src/org/eclipse/libra/framework/core/module/OsgiModuleDeployableFactory.java
@@ -86,7 +86,7 @@
 	}
 
 	
-	private boolean isValidModule(IProject project) {
+	private static boolean isValidModule(IProject project) {
 		try {
 			IFacetedProject facetedProject = ProjectFacetsManager
 					.create(project);
diff --git a/plugins/org.eclipse.libra.framework.editor.integration/src/org/eclipse/libra/framework/editor/integration/admin/osgijmx/AbstractOSGiJMXFrameworkAdmin.java b/plugins/org.eclipse.libra.framework.editor.integration/src/org/eclipse/libra/framework/editor/integration/admin/osgijmx/AbstractOSGiJMXFrameworkAdmin.java
index d56d038..930ed8a 100644
--- a/plugins/org.eclipse.libra.framework.editor.integration/src/org/eclipse/libra/framework/editor/integration/admin/osgijmx/AbstractOSGiJMXFrameworkAdmin.java
+++ b/plugins/org.eclipse.libra.framework.editor.integration/src/org/eclipse/libra/framework/editor/integration/admin/osgijmx/AbstractOSGiJMXFrameworkAdmin.java
@@ -66,9 +66,10 @@
 			ServiceStateMBean serviceStateMBean = getServiceStateMBean(connection);

 			ServicesData servicesData = new ServicesData(serviceStateMBean);

 			

-			Set keys = bundlesData.keySet();

+			Set<?> keys = bundlesData.keySet();

 			for (Object key : keys) {

-				CompositeData bundleInfo = bundlesData.get(((Collection) key).toArray());

+				// TODO Weird cast & get?

+				CompositeData bundleInfo = bundlesData.get(((Collection<?>) key).toArray());

 				String id = bundleInfo.get(BundleStateMBean.IDENTIFIER).toString();

 				String symbolicName = bundleInfo.get(BundleStateMBean.SYMBOLIC_NAME).toString();

 				String version = bundleInfo.get(BundleStateMBean.VERSION).toString();

@@ -77,9 +78,10 @@
 				Bundle bundle = new Bundle(id, symbolicName, version, state, location);

 				

 				TabularData headers = (TabularData) bundleInfo.get(BundleStateMBean.HEADERS);

-				Set headerKeys = headers.keySet();

+				Set<?> headerKeys = headers.keySet();

 				for (Object headerKey : headerKeys) {

-					CompositeData headerCData = headers.get(((Collection) headerKey).toArray()); 

+					// TODO Weird cast & get?

+					CompositeData headerCData = headers.get(((Collection<?>) headerKey).toArray()); 

 					String hKey = (String) headerCData.get(BundleStateMBean.KEY);

 					String hValue = (String) headerCData.get(BundleStateMBean.VALUE);

 					bundle.addHeader(hKey, hValue);

@@ -124,7 +126,7 @@
 					bundle.addUsingService(sr); 

 				}

 				

-				map.put(Long.parseLong(id), bundle);

+				map.put(Long.valueOf(id), bundle);

 			}

 		} catch (UndeclaredThrowableException e) {

 			if (e.getCause() instanceof InstanceNotFoundException) {

diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/dependencies/BundleDependencyEditorPage.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/dependencies/BundleDependencyEditorPage.java
index 542e185..a119b9a 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/dependencies/BundleDependencyEditorPage.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/dependencies/BundleDependencyEditorPage.java
@@ -44,8 +44,8 @@
 import org.eclipse.libra.framework.editor.ui.internal.dependencies.FocusedBundleDependencyLayoutAlgorithm;
 import org.eclipse.libra.framework.editor.ui.overview.BundleInformationEditorPage;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.events.ModifyEvent;
 import org.eclipse.swt.events.ModifyListener;
 import org.eclipse.swt.events.SelectionAdapter;
@@ -336,8 +336,10 @@
 					context.run(true, true, runnable);
 				}
 				catch (InvocationTargetException e1) {
+					e1.printStackTrace();
 				}
 				catch (InterruptedException e2) {
+					e2.printStackTrace();
 				}
 			}
 
@@ -347,8 +349,8 @@
 		sform.updateToolBar();
 		initPopupMenu();
 
-		searchControl.getSearchText().addKeyListener(new KeyListener() {
-
+		searchControl.getSearchText().addKeyListener(new KeyAdapter() {
+			@Override
 			public void keyPressed(KeyEvent e) {
 				if (e.character == SWT.CR || e.character == SWT.LF) {
 					if (!"type filter text".equals(searchControl.getSearchText().getText())) {
@@ -360,9 +362,6 @@
 					}
 				}
 			}
-
-			public void keyReleased(KeyEvent e) {
-			}
 		});
 
 		searchControl.getSearchText().addModifyListener(new ModifyListener() {
diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyContentResult.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyContentResult.java
index 14110fb..fcda6dd 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyContentResult.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyContentResult.java
@@ -74,16 +74,16 @@
 	public Integer getIncomingDegree() {
 		int degree = 0;
 		for (Integer integer : incomingDependencies.keySet()) {
-			degree = Math.max(degree, integer);
+			degree = Math.max(degree, integer.intValue());
 		}
-		return degree;
+		return Integer.valueOf(degree);
 	}
 
 	public Integer getOutgoingDegree() {
 		int degree = 0;
 		for (Integer integer : outgoingDependencies.keySet()) {
-			degree = Math.max(degree, integer);
+			degree = Math.max(degree, integer.intValue());
 		}
-		return degree;
+		return Integer.valueOf(degree);
 	}
 }
diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyLayoutAlgorithm.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyLayoutAlgorithm.java
index e474ca7..a468487 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyLayoutAlgorithm.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/BundleDependencyLayoutAlgorithm.java
@@ -131,15 +131,15 @@
 			currentY = boundsY + 10;
 			currentX = currentX + columnWith + 30;
 
-			int maxDegree = contentResult.getOutgoingDegree();
+			int maxDegree = contentResult.getOutgoingDegree().intValue();
 			degree = 1;
 			while (degree <= maxDegree) {
 				Set<InternalNode> degreeNodes = new HashSet<InternalNode>();
-				Set<IBundle> deps = contentResult.getOutgoingDependencies().get(degree);
+				Set<IBundle> deps = contentResult.getOutgoingDependencies().get(Integer.valueOf(degree));
 				for (IBundle bundle : deps) {
 					if (!bundlesProcessed.contains(bundle)
 							&& !rootBundles.contains(bundle)
-							&& lowestRanking(bundle, contentResult.getOutgoingDegree(), contentResult
+							&& lowestRanking(bundle, maxDegree, contentResult
 									.getOutgoingDependencies()) == degree) {
 						for (InternalNode node : entitiesToLayout) {
 							LayoutEntity obj = node.getLayoutEntity();
@@ -186,10 +186,10 @@
 		}
 	}
 
-	private int lowestRanking(IBundle bundle, int maxDegree, Map<Integer, Set<IBundle>> bundles) {
+	private static int lowestRanking(IBundle bundle, int maxDegree, Map<Integer, Set<IBundle>> bundles) {
 		int ranking = 1;
 		while (ranking <= maxDegree) {
-			for (IBundle b : bundles.get(ranking)) {
+			for (IBundle b : bundles.get(Integer.valueOf(ranking))) {
 				if (b.equals(bundle)) {
 					return ranking;
 				}
@@ -216,15 +216,18 @@
 
 	@Override
 	protected void postLayoutAlgorithm(InternalNode[] entitiesToLayout, InternalRelationship[] relationshipsToConsider) {
+		// nothing
 	}
 
 	@Override
 	protected void preLayoutAlgorithm(InternalNode[] entitiesToLayout, InternalRelationship[] relationshipsToConsider,
 			double x, double y, double width, double height) {
+		// nothing
 	}
 
 	@Override
 	public void setLayoutArea(double x, double y, double width, double height) {
+		// nothing
 	}
 
 	static class ColumnHolder {
diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/FocusedBundleDependencyLayoutAlgorithm.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/FocusedBundleDependencyLayoutAlgorithm.java
index 8fc50d7..2de89f0 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/FocusedBundleDependencyLayoutAlgorithm.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/dependencies/FocusedBundleDependencyLayoutAlgorithm.java
@@ -32,6 +32,9 @@
 
 	private final BundleDependencyContentProvider contentProvider;
 
+	/**
+	 * @param styles unused 
+	 */
 	public FocusedBundleDependencyLayoutAlgorithm(int styles, CompositeLayoutAlgorithm layoutAlgorithm,
 			BundleDependencyContentProvider contentProvider) {
 		this.contentProvider = contentProvider;
diff --git a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/overview/BundleInformationDetailsPart.java b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/overview/BundleInformationDetailsPart.java
index 810cc16..fb60aa8 100644
--- a/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/overview/BundleInformationDetailsPart.java
+++ b/plugins/org.eclipse.libra.framework.editor.ui/src/org/eclipse/libra/framework/editor/ui/internal/overview/BundleInformationDetailsPart.java
@@ -147,10 +147,10 @@
 
 	class PackageImportContentProvider implements ITreeContentProvider {
 
-		private IBundle bundle;
+		private IBundle cpBundle;
 
 		public void dispose() {
-
+			// nothing
 		}
 
 		public Object[] getChildren(Object parentElement) {
@@ -165,8 +165,8 @@
 		}
 
 		public Object[] getElements(Object inputElement) {
-			if (bundle.getPackageImports().size() > 0) {
-				return bundle.getPackageImports().toArray();
+			if (cpBundle.getPackageImports().size() > 0) {
+				return cpBundle.getPackageImports().toArray();
 			}
 			return new Object[] { "<no imported packages>" };
 		}
@@ -180,7 +180,7 @@
 		}
 
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			bundle = (IBundle) newInput;
+			cpBundle = (IBundle) newInput;
 		}
 	}
 
@@ -237,6 +237,7 @@
 		private IServiceReference ref;
 
 		public void dispose() {
+			// nothing
 		}
 
 		public Object[] getElements(Object inputElement) {
@@ -301,10 +302,10 @@
 			}
 		}
 
-		private IBundle bundle;
+		private IBundle cpBundle;
 
 		public void dispose() {
-
+			// nothing
 		}
 
 		public Object[] getChildren(Object parentElement) {
@@ -329,11 +330,11 @@
 
 		public Object[] getElements(Object inputElement) {
 			Set<ServicesHolder> serviceHolder = new HashSet<ServicesHolder>();
-			if (bundle.getRegisteredServices().size() > 0) {
-				serviceHolder.add(new ServicesHolder(bundle.getRegisteredServices(), "Registered Services"));
+			if (cpBundle.getRegisteredServices().size() > 0) {
+				serviceHolder.add(new ServicesHolder(cpBundle.getRegisteredServices(), "Registered Services"));
 			}
-			if (bundle.getServicesInUse().size() > 0) {
-				serviceHolder.add(new ServicesHolder(bundle.getServicesInUse(), "Services in Use"));
+			if (cpBundle.getServicesInUse().size() > 0) {
+				serviceHolder.add(new ServicesHolder(cpBundle.getServicesInUse(), "Services in Use"));
 			}
 			if (serviceHolder.size() > 0) {
 				return serviceHolder.toArray();
@@ -350,7 +351,7 @@
 		}
 
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			bundle = (IBundle) newInput;
+			cpBundle = (IBundle) newInput;
 		}
 	}
 
diff --git a/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/IEquinoxFramework.java b/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/IEquinoxFramework.java
index 2174bec..e1dbe78 100644
--- a/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/IEquinoxFramework.java
+++ b/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/IEquinoxFramework.java
@@ -14,5 +14,5 @@
 
 
 public interface IEquinoxFramework extends IOSGIFramework {
-	
+	// nothing
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxFrameworkInstanceBehavior.java b/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxFrameworkInstanceBehavior.java
index 8c5ed6d..ad140d2 100644
--- a/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxFrameworkInstanceBehavior.java
+++ b/plugins/org.eclipse.libra.framework.equinox/src/org/eclipse/libra/framework/equinox/internal/EquinoxFrameworkInstanceBehavior.java
@@ -119,15 +119,15 @@
 		if (status != null && !status.isOK())
 			throw new CoreException(status);
 
-		monitor = ProgressUtil.getMonitorFor(monitor);
-		monitor.beginTask(Messages.publishServerTask, 600);
+		IProgressMonitor monitor2 = ProgressUtil.getMonitorFor(monitor);
+		monitor2.beginTask(Messages.publishServerTask, 600);
 
 		// TODO OSAMI 1) Cleanup 2) Backup and Publish,
 
 		// if (status != null && !status.isOK())
 		// throw new CoreException(status);
 
-		monitor.done();
+		monitor2.done();
 
 		setServerPublishState(IServer.PUBLISH_STATE_NONE);
 	}
@@ -137,16 +137,18 @@
 	protected void publishModules(int kind, List modules, List deltaKind2,
 			MultiStatus multi, IProgressMonitor monitor) {
 
+		@SuppressWarnings("unchecked")
+		final List<IModule[]> myModules = modules;
 
 		IPath confDir = getBaseDirectory();
 
 		FrameworkInstanceConfiguration equinoxConfiguration;
 		try {
 			equinoxConfiguration = getEquinoxRuntimeInstance().getEquinoxConfiguration();
-			publishHelper.exportBundles(modules, equinoxConfiguration, confDir);
+			publishHelper.exportBundles(myModules, equinoxConfiguration, confDir);
 			String frameworkJarPath = "reference:file:"+getEquinoxRuntimeInstance().getFrameworkJarPath();
 			getEquinoxVersionHandler().prepareFrameworkConfigurationFile(confDir,
-					publishHelper.getServerModules(modules,"reference:file:", " " ),
+					publishHelper.getServerModules(myModules,"reference:file:", " " ),
 					frameworkJarPath, publishHelper.getTargetBundles(equinoxConfiguration));
 
 		} catch (CoreException e) {
diff --git a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/FelixFrameworkInstance.java b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/FelixFrameworkInstance.java
index 5e8bfbb..51f49ed 100644
--- a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/FelixFrameworkInstance.java
+++ b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/FelixFrameworkInstance.java
@@ -111,7 +111,7 @@
 
 	}
 
-	private ITargetLocation[] getDefaultBundleContainers(IPath installPath) {
+	private static ITargetLocation[] getDefaultBundleContainers(IPath installPath) {
 		ITargetLocation[] containers = new ITargetLocation[2];
 		ITargetPlatformService service = TargetDefinitionUtil.getTargetPlatformService();
 
diff --git a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/IFelixFramework.java b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/IFelixFramework.java
index 702c18e..98414b6 100644
--- a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/IFelixFramework.java
+++ b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/IFelixFramework.java
@@ -14,5 +14,5 @@
 
 
 public interface IFelixFramework extends IOSGIFramework {
-	
+	// nothing
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixRuntimeInstanceBehavior.java b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixRuntimeInstanceBehavior.java
index 74f0765..f790574 100644
--- a/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixRuntimeInstanceBehavior.java
+++ b/plugins/org.eclipse.libra.framework.felix/src/org/eclipse/libra/framework/felix/internal/FelixRuntimeInstanceBehavior.java
@@ -118,15 +118,15 @@
 		if (status != null && !status.isOK())
 			throw new CoreException(status);
 
-		monitor = ProgressUtil.getMonitorFor(monitor);
-		monitor.beginTask(Messages.publishServerTask, 600);
+		IProgressMonitor monitor2 = ProgressUtil.getMonitorFor(monitor);
+		monitor2.beginTask(Messages.publishServerTask, 600);
 
 		// TODO OSAMI 1) Cleanup 2) Backup and Publish,
 
 		// if (status != null && !status.isOK())
 		// throw new CoreException(status);
 
-		monitor.done();
+		monitor2.done();
 
 		setServerPublishState(IServer.PUBLISH_STATE_NONE);
 	}
@@ -136,6 +136,8 @@
 	protected void publishModules(int kind, List modules, List deltaKind2,
 			MultiStatus multi, IProgressMonitor monitor) {
 
+		@SuppressWarnings("unchecked")
+		final List<IModule[]> myModules = modules;
 
 		IPath confDir = getBaseDirectory();
 
@@ -145,9 +147,9 @@
 			felixConfiguration = getFelixRuntimeInstance().getFelixConfiguration();
 			
 			
-			publishHelper.exportBundles(modules, felixConfiguration, confDir);
+			publishHelper.exportBundles(myModules, felixConfiguration, confDir);
 			getFelixVersionHandler().prepareFrameworkConfigurationFile(confDir,
-					publishHelper.getServerModules(modules,"reference:file:", " " ),
+					publishHelper.getServerModules(myModules,"reference:file:", " " ),
 					publishHelper.getTargetBundles(felixConfiguration,"reference:file:", " "));
 
 		} catch (CoreException e) {
diff --git a/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/IJonasFramework.java b/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/IJonasFramework.java
index d61702b..50acfda 100644
--- a/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/IJonasFramework.java
+++ b/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/IJonasFramework.java
@@ -14,5 +14,5 @@
 
 
 public interface IJonasFramework extends IOSGIFramework {
-	
+	// nothing
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasFrameworkInstanceBehavior.java b/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasFrameworkInstanceBehavior.java
index 9cdd113..58562cc 100644
--- a/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasFrameworkInstanceBehavior.java
+++ b/plugins/org.eclipse.libra.framework.jonas/src/org/eclipse/libra/framework/jonas/internal/JonasFrameworkInstanceBehavior.java
@@ -116,15 +116,15 @@
 		if (status != null && !status.isOK())
 			throw new CoreException(status);
 
-		monitor = ProgressUtil.getMonitorFor(monitor);
-		monitor.beginTask(Messages.publishServerTask, 600);
+		IProgressMonitor monitor2 = ProgressUtil.getMonitorFor(monitor);
+		monitor2.beginTask(Messages.publishServerTask, 600);
 
 		// TODO OSAMI 1) Cleanup 2) Backup and Publish,
 
 		// if (status != null && !status.isOK())
 		// throw new CoreException(status);
 
-		monitor.done();
+		monitor2.done();
 
 		setServerPublishState(IServer.PUBLISH_STATE_NONE);
 	}
@@ -134,6 +134,8 @@
 	protected void publishModules(int kind, List modules, List deltaKind2,
 			MultiStatus multi, IProgressMonitor monitor) {
 
+		@SuppressWarnings("unchecked")
+		final List<IModule[]> myModules = modules;
 
 		IPath confDir = getBaseDirectory();
 
@@ -148,9 +150,9 @@
 				deployPath.mkdir();
 			}
 			
-			publishHelper.exportBundles(modules, jonasConfiguration, installDir, deployDir);
+			publishHelper.exportBundles(myModules, jonasConfiguration, installDir, deployDir);
 			getJonasVersionHandler().prepareFrameworkConfigurationFile(deployDir,
-					publishHelper.getServerModules(modules,"reference:file:", " " ),
+					publishHelper.getServerModules(myModules,"reference:file:", " " ),
 					publishHelper.getTargetBundles(jonasConfiguration,"reference:file:", " "));
 
 		} catch (CoreException e) {
diff --git a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/IKnopflerfishFramework.java b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/IKnopflerfishFramework.java
index 3f529b2..2741724 100644
--- a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/IKnopflerfishFramework.java
+++ b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/IKnopflerfishFramework.java
@@ -14,5 +14,5 @@
 
 
 public interface IKnopflerfishFramework extends IOSGIFramework {
-	
+	// nothing
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/Knopflerfish31Handler.java b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/Knopflerfish31Handler.java
index 3be7c7f..dfadac3 100644
--- a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/Knopflerfish31Handler.java
+++ b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/Knopflerfish31Handler.java
@@ -130,7 +130,7 @@
 		return true;
 	}
 
-	private void writeXargs(IPath installPath, IPath confPath, PrintWriter out,
+	private static void writeXargs(IPath installPath, IPath confPath, PrintWriter out,
 			KnopflerfishConfigurationPublishHelper publishHelper,
 			FrameworkInstanceConfiguration configuration) {
 
@@ -195,7 +195,11 @@
 		out.flush();
 	}
 
-	private void writePropsXargs(PrintWriter out,
+	/**
+	 * @param publishHelper  unused
+	 * @param configuration  unused
+	 */
+	private static void writePropsXargs(PrintWriter out,
 			KnopflerfishConfigurationPublishHelper publishHelper,
 			FrameworkInstanceConfiguration configuration) {
 
@@ -262,6 +266,7 @@
 				try {
 					out.close();
 				} catch (IOException e) {
+					e.printStackTrace();
 				}
 		}
 	}
diff --git a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishFrameworkInstanceBehavior.java b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishFrameworkInstanceBehavior.java
index e9c0e34..4b8eaab 100644
--- a/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishFrameworkInstanceBehavior.java
+++ b/plugins/org.eclipse.libra.framework.knopflerfish/src/org/eclipse/libra/framework/knopflerfish/internal/KnopflerfishFrameworkInstanceBehavior.java
@@ -116,15 +116,15 @@
 		if (status != null && !status.isOK())
 			throw new CoreException(status);
 
-		monitor = ProgressUtil.getMonitorFor(monitor);
-		monitor.beginTask(Messages.publishServerTask, 600);
+		IProgressMonitor monitor2 = ProgressUtil.getMonitorFor(monitor);
+		monitor2.beginTask(Messages.publishServerTask, 600);
 
 		// TODO OSAMI 1) Cleanup 2) Backup and Publish,
 
 		// if (status != null && !status.isOK())
 		// throw new CoreException(status);
 
-		monitor.done();
+		monitor2.done();
 
 		setServerPublishState(IServer.PUBLISH_STATE_NONE);
 	}
@@ -134,6 +134,9 @@
 	protected void publishModules(int kind, List modules, List deltaKind2,
 			MultiStatus multi, IProgressMonitor monitor) {
 
+		@SuppressWarnings("unchecked")
+		final List<IModule[]> myModules = modules;
+
 
 		IPath confDir = getBaseDirectory();
 		IPath installPath = getServer().getRuntime().getLocation();
@@ -152,7 +155,7 @@
 		FrameworkInstanceConfiguration felixConfiguration;
 		try {
 			felixConfiguration = getKnopflerfishRuntimeInstance().getKnopflerfishConfiguration();
-			publishHelper.exportBundles(modules, felixConfiguration, confDir);
+			publishHelper.exportBundles(myModules, felixConfiguration, confDir);
 			((Knopflerfish31Handler)getKnopflerfishVersionHandler()).prepareFrameworkConfigurationFile(installPath,confDir,publishHelper,felixConfiguration);
 
 		} catch (CoreException e) {
diff --git a/plugins/org.eclipse.libra.framework.ui/src/org/eclipse/libra/framework/ui/CleanWorkDirDialog.java b/plugins/org.eclipse.libra.framework.ui/src/org/eclipse/libra/framework/ui/CleanWorkDirDialog.java
index d9176d5..6997943 100644
--- a/plugins/org.eclipse.libra.framework.ui/src/org/eclipse/libra/framework/ui/CleanWorkDirDialog.java
+++ b/plugins/org.eclipse.libra.framework.ui/src/org/eclipse/libra/framework/ui/CleanWorkDirDialog.java
@@ -166,9 +166,6 @@
 		protected IStatus run(IProgressMonitor monitor) {
 			final Object mutex = new Object();
 
-			if (module != null) {
-			}
-			
 			// If state has changed since dialog was open, abort
 			if (server.getServerState() != state) {
 				return newErrorStatus(
diff --git a/plugins/org.eclipse.libra.framework.ui/src/org/eclipse/libra/framework/ui/internal/actions/AbstractSyncLaunch.java b/plugins/org.eclipse.libra.framework.ui/src/org/eclipse/libra/framework/ui/internal/actions/AbstractSyncLaunch.java
index 3e44f51..c055412 100644
--- a/plugins/org.eclipse.libra.framework.ui/src/org/eclipse/libra/framework/ui/internal/actions/AbstractSyncLaunch.java
+++ b/plugins/org.eclipse.libra.framework.ui/src/org/eclipse/libra/framework/ui/internal/actions/AbstractSyncLaunch.java
@@ -37,7 +37,7 @@
 	 * @see IObjectActionDelegate#setActivePart(IAction, IWorkbenchPart)
 	 */
 	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		
+		// nothing
 	}
 	
 	/**
diff --git a/plugins/org.eclipse.libra.warproducts.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.libra.warproducts.core/.settings/org.eclipse.jdt.core.prefs
index 981bf0d..0c298fa 100644
--- a/plugins/org.eclipse.libra.warproducts.core/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.libra.warproducts.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,13 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnull.secondary=
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
@@ -17,6 +26,7 @@
 org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -24,12 +34,15 @@
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
 org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
 org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
 org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
 org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
 org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
 org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
@@ -38,21 +51,35 @@
 org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
 org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
 org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.parameterAssignment=warning
+org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
 org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
@@ -62,6 +89,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedImport=warning
 org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
 org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
@@ -71,6 +99,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/WARProduct.java b/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/WARProduct.java
index aa60a21..d720af9 100644
--- a/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/WARProduct.java
+++ b/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/WARProduct.java
@@ -26,7 +26,7 @@
 
   private static final long serialVersionUID = -8956436490095281273L;
   private IProduct delegate;
-  private Map libraries;
+  private Map<IPath, Boolean> libraries;
   private IPath webXmlPath;
   private IPath launchIniPath;
   private IPreferencesInfo fPreferencesInfo;
@@ -34,7 +34,7 @@
 
   public WARProduct( final IProduct delegate ) {
     this.delegate = delegate;
-    libraries = new HashMap();
+    libraries = new HashMap<IPath, Boolean>();
   }
   
   public void addLibrary( final IPath libraryPath, final boolean fromTarget ) {
@@ -67,13 +67,13 @@
 
   public IPath[] getLibraries() {
     IPath[] result = new IPath[ libraries.size() ];
-    Set keySet = libraries.keySet();
+    Set<IPath> keySet = libraries.keySet();
     keySet.toArray( result );
     return result;
   }
   
   public boolean isLibraryFromTarget( final IPath libraryPath ) {
-    Boolean result = ( Boolean )libraries.get( libraryPath );
+    Boolean result = libraries.get( libraryPath );
     return result.booleanValue();
   }
   
@@ -193,7 +193,7 @@
       libraries.keySet().toArray( pathes );
       for( int i = 0; i < pathes.length; i++ ) {
         String libraryPath = pathes[ i ].toPortableString();
-        Boolean fromTarget = ( Boolean )libraries.get( pathes[ i ] );
+        Boolean fromTarget = libraries.get( pathes[ i ] );
         writer.println( "      " + "<library path=\"" + libraryPath +  //$NON-NLS-1$ //$NON-NLS-2$
                         "\" fromTarget=\"" + fromTarget + "\"/>" ); //$NON-NLS-1$ //$NON-NLS-2$
       }
@@ -300,7 +300,7 @@
   }
   
   public IPluginConfiguration[] getPluginConfigurations() {
-    List containedBundles = new ArrayList();
+    List<IPluginConfiguration> containedBundles = new ArrayList<IPluginConfiguration>();
     IProductPlugin[] plugins = getPlugins();
     if( plugins != null && plugins.length > 0 ) {
       WARProductModelFactory factory = new WARProductModelFactory( getModel() );
diff --git a/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/WARProductExportOperation.java b/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/WARProductExportOperation.java
index 60b50ec..030503b 100644
--- a/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/WARProductExportOperation.java
+++ b/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/WARProductExportOperation.java
@@ -270,7 +270,7 @@
     }
   }
       
-  private void copyLibrary( final String libDir, final IPath filePath ) 
+  private static void copyLibrary( final String libDir, final IPath filePath ) 
     throws IOException 
   {
     String fileName = filePath.segment( filePath.segmentCount() - 1 );
@@ -325,8 +325,7 @@
     if( fInfo.exportSource && fInfo.exportSourceBundle ) {
       properties.put( IBuildPropertiesConstants.PROPERTY_INDIVIDUAL_SOURCE,
                       "true" ); //$NON-NLS-1$
-      List workspacePlugins     
-        = Arrays.asList( PluginRegistry.getWorkspaceModels() );
+      List<IPluginModelBase> workspacePlugins = Arrays.asList( PluginRegistry.getWorkspaceModels() );
       for( int i = 0; i < fInfo.items.length; i++ ) {
         if( fInfo.items[ i ] instanceof IFeatureModel ) {
           IFeature feature = ( ( IFeatureModel )fInfo.items[ i ] ).getFeature();
@@ -361,7 +360,7 @@
     return fInfo.exportMetadata;
   }
 
-  private String getRootFileLocations( final boolean hasLaunchers ) {
+  private static String getRootFileLocations( final boolean hasLaunchers ) {
     // Get the files that go in the root of the eclipse install, excluding the
     // launcher
     StringBuffer buffer = new StringBuffer();
@@ -380,7 +379,7 @@
     return buffer.toString();
   }
 
-  private void appendAbsolutePath( final StringBuffer buffer, 
+  private static void appendAbsolutePath( final StringBuffer buffer, 
                                    final File file ) 
   {
     if( buffer.length() > 0 )
@@ -389,8 +388,8 @@
     buffer.append( file.getAbsolutePath() );
   }
 
-  protected HashMap createAntBuildProperties( final String[][] configs ) {
-    HashMap properties = super.createAntBuildProperties( configs );
+  protected HashMap<String,String> createAntBuildProperties( final String[][] configs ) {
+    HashMap<String,String> properties = super.createAntBuildProperties( configs );
     fAntBuildProperties.put( IXMLConstants.PROPERTY_COLLECTING_FOLDER, root );
     fAntBuildProperties.put( IXMLConstants.PROPERTY_ARCHIVE_PREFIX, root );
     return properties;
@@ -433,7 +432,7 @@
     return super.getAssemblyScriptName( featureID, os, ws, arch, featureLocation );
   }
   
-  private void addExtensionbundleToConfigIni( String configIni ) {
+  private static void addExtensionbundleToConfigIni( String configIni ) {
     try {
       File file = new File( configIni );
       if( file.exists() ) {
diff --git a/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/validation/Validation.java b/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/validation/Validation.java
index c9597dc..3a2032b 100644
--- a/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/validation/Validation.java
+++ b/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/validation/Validation.java
@@ -15,10 +15,10 @@
 
 public class Validation {
   
-  private List errors;
+  private List<ValidationError> errors;
 
   Validation() {
-    this.errors = new ArrayList();
+    this.errors = new ArrayList<ValidationError>();
   }
 
   public boolean isValid() {
diff --git a/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/validation/Validator.java b/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/validation/Validator.java
index 2ab1459..c464622 100644
--- a/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/validation/Validator.java
+++ b/plugins/org.eclipse.libra.warproducts.core/src/org/eclipse/libra/warproducts/core/validation/Validator.java
@@ -84,7 +84,7 @@
     }
   }
 
-  private boolean librariesContainsServletBridge( final IPath[] libraries ) {
+  private static boolean librariesContainsServletBridge( final IPath[] libraries ) {
     boolean result = false;
     for( int i = 0; i < libraries.length && !result; i++ ) {
       IPath path = libraries[ i ];
@@ -146,7 +146,7 @@
     }
   }
 
-  private String[] getBundleIdArray( final IProductPlugin[] plugins ) {
+  private static String[] getBundleIdArray( final IProductPlugin[] plugins ) {
     String[] result = new String[ plugins.length ];
     for( int i = 0; i < plugins.length; i++ ) {
       result[ i ] = plugins[ i ].getId();
@@ -167,7 +167,7 @@
     validation.addError( error );
   }
 
-  private boolean isBundleContained( final String id, 
+  private static boolean isBundleContained( final String id, 
                                      final String[] bundleList ) 
   {
     boolean result = false;
diff --git a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/editor/LibrarySection.java b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/editor/LibrarySection.java
index 74ab8da..047fa7d 100644
--- a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/editor/LibrarySection.java
+++ b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/editor/LibrarySection.java
@@ -272,7 +272,7 @@
     dialog.create();
     IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
     helpSystem.setHelp( dialog.getShell(), IHelpContextIds.ADD_LIBRARY );
-    List newLibs = new ArrayList();
+    List<IPath> newLibs = new ArrayList<IPath>();
     if( dialog.open() == Window.OK ) {
       updateProduct( dialog, newLibs );
     }
@@ -281,7 +281,7 @@
   }
 
   private void updateProduct( final ElementTreeSelectionDialog dialog, 
-                              final List newLibs )
+                              final List<IPath> newLibs )
   {
     Object[] elements = dialog.getResult();
     for( int i = 0; i < elements.length; i++ ) {
@@ -304,7 +304,7 @@
     }
   }
 
-  private void tryToAddServletBridge( final IWARProduct product, 
+  private static void tryToAddServletBridge( final IWARProduct product, 
                                       final Validation validation )
   {
     ValidationError[] errors = validation.getErrors();
diff --git a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/editor/PluginSectionExtended.java b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/editor/PluginSectionExtended.java
index ac73fa9..ebcf05e 100644
--- a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/editor/PluginSectionExtended.java
+++ b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/editor/PluginSectionExtended.java
@@ -43,11 +43,12 @@
     }
   }
 
-  private void validHandleAddRequired( final IProductPlugin[] plugins,
-                                       final boolean includeOptional )
+  private static void validHandleAddRequired(
+                                             final IProductPlugin[] plugins,
+                                             final boolean includeOptional )
   {
     if( plugins.length > 0 ) {
-      ArrayList list = new ArrayList( plugins.length );
+      ArrayList<BundleDescription> list = new ArrayList<BundleDescription>( plugins.length );
       for( int i = 0; i < plugins.length; i++ ) {
         list.add( TargetPlatformHelper.getState()
           .getBundle( plugins[ i ].getId(), null ) );
@@ -70,7 +71,7 @@
           }
         }
       }
-      List dependencies = validateBundleIds( calculator.getBundleIDs() );
+      List<String> dependencies = validateBundleIds( calculator.getBundleIDs() );
       validateBundleIds( dependencies );
       
       IProduct product = plugins[ 0 ].getProduct();
@@ -78,7 +79,7 @@
       IProductPlugin[] requiredPlugins 
         = new IProductPlugin[ dependencies.size() ];
       for( int i = 0; i < requiredPlugins.length; i++ ) {
-        String id = ( String )dependencies.get( i );
+        String id = dependencies.get( i );
         IProductPlugin plugin = factory.createPlugin();
         plugin.setId( id );
         requiredPlugins[ i ] = plugin;
@@ -87,24 +88,24 @@
     }
   }
 
-  private List validateBundleIds( final Collection bundleIDs ) {
-    List validBundles = new ArrayList();
+  private static List<String> validateBundleIds( final Collection<String> bundleIDs ) {
+    List<String> validBundles = new ArrayList<String>();
     copyBundleIds( bundleIDs, validBundles );
     handleBannedBundles( validBundles );
     handleRequiredBundles( validBundles );
     return validBundles;
   }
 
-  private void copyBundleIds( final Collection bundleIDs, 
-                              final List validBundles ) 
+  private static void copyBundleIds( final Collection<String> bundleIDs, 
+                              final List<String> validBundles ) 
   {
-    Iterator iter = bundleIDs.iterator();
+    Iterator<String> iter = bundleIDs.iterator();
     while( iter.hasNext() ) {
       validBundles.add( iter.next() );
     }
   }
 
-  private void handleRequiredBundles( final Collection bundleIDs ) {
+  private static void handleRequiredBundles( final Collection<String> bundleIDs ) {
     String[] requiredBundles = Validator.REQUIRED_BUNDLES;
     for( int i = 0; i < requiredBundles.length; i++ ) {
       String requiredId = requiredBundles[ i ];
@@ -114,7 +115,7 @@
     }
   }
 
-  private void handleBannedBundles( final Collection bundleIDs ) {
+  private static void handleBannedBundles( final Collection<String> bundleIDs ) {
     String[] bannedBundles = Validator.BANNED_BUNDLES;
     for( int i = 0; i < bannedBundles.length; i++ ) {
       String bannedId = bannedBundles[ i ];
diff --git a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/editor/WARProductOutlinePage.java b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/editor/WARProductOutlinePage.java
index ba83282..9774f7c 100644
--- a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/editor/WARProductOutlinePage.java
+++ b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/editor/WARProductOutlinePage.java
@@ -28,8 +28,8 @@
 public class WARProductOutlinePage extends FormOutlinePage {
 
   private Object[] plugins;
-  private Object[] libraries;
-  private final Comparator libraryComparator;
+  private IPath[] libraries;
+  private final Comparator<IPath> libraryComparator;
   
   public WARProductOutlinePage( final PDEFormEditor editor ) {
     super( editor );
@@ -79,13 +79,11 @@
     return result;
   }
   
-  private static class LibraryComparator implements Comparator, Serializable {
+  private static class LibraryComparator implements Comparator<IPath>, Serializable {
     private static final long serialVersionUID = -877535050574491831L;
 
-    public int compare( final Object o1, 
-                        final Object o2 ) {
-      IPath p1 = ( IPath )o1;
-      IPath p2 = ( IPath )o2;
+    public int compare( final IPath p1, 
+                        final IPath p2 ) {
       return p1.toOSString().compareTo( p2.toOSString() );
     }
   }
diff --git a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/exportwizard/ExportWARProductWizard.java b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/exportwizard/ExportWARProductWizard.java
index 9398336..58c6b88 100644
--- a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/exportwizard/ExportWARProductWizard.java
+++ b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/exportwizard/ExportWARProductWizard.java
@@ -189,7 +189,7 @@
   }
 
   private BundleDescription[] getPluginModels() {
-    ArrayList list = new ArrayList();
+    ArrayList<BundleDescription> list = new ArrayList<BundleDescription>();
     State state = TargetPlatformHelper.getState();
     IProductPlugin[] plugins = product.getPlugins();
     for( int i = 0; i < plugins.length; i++ ) {
diff --git a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/newwizard/WARProductFileWizardPage.java b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/newwizard/WARProductFileWizardPage.java
index 725f093..04f8a67 100644
--- a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/newwizard/WARProductFileWizardPage.java
+++ b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/newwizard/WARProductFileWizardPage.java
@@ -88,8 +88,8 @@
     basicButton.setSelection( true );
   }
 
-  private String[] getLaunchConfigurations() {
-    ArrayList list = new ArrayList();
+  private static String[] getLaunchConfigurations() {
+    ArrayList<String> list = new ArrayList<String>();
     try {
       String eclipseConf = EclipseLaunchShortcut.CONFIGURATION_TYPE;
       addLaunchConfigToListFromType( list, eclipseConf  );
@@ -103,10 +103,10 @@
       PDEPlugin.logException( e );
     }
     String[] launchConfigArray = new String[ list.size() ];
-    return ( String[] )list.toArray( launchConfigArray );
+    return list.toArray( launchConfigArray );
   }
   
-  private void addLaunchConfigToListFromType( final List list, 
+  private static void addLaunchConfigToListFromType( final List<String> list, 
                                               final String type ) 
     throws CoreException 
   {
@@ -222,7 +222,7 @@
     return result;
   }
 
-  private IContainer getSelectedContainer( final IPath containerPath ) {
+  private static IContainer getSelectedContainer( final IPath containerPath ) {
     IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
     IContainer container;
     if( containerPath.segmentCount() > 1 ) {
diff --git a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/newwizard/WARProductFromConfigOperation.java b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/newwizard/WARProductFromConfigOperation.java
index 1366a8b..fd55819 100644
--- a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/newwizard/WARProductFromConfigOperation.java
+++ b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/newwizard/WARProductFromConfigOperation.java
@@ -17,6 +17,7 @@
 import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
 import org.eclipse.libra.warproducts.core.*;
 import org.eclipse.libra.warproducts.ui.WARProductConstants;
+import org.eclipse.pde.core.plugin.IPluginModelBase;
 import org.eclipse.pde.core.plugin.TargetPlatform;
 import org.eclipse.pde.internal.core.iproduct.*;
 import org.eclipse.pde.internal.core.iproduct.IProduct;
@@ -119,8 +120,8 @@
       workspaceId = IPDELauncherConstants.WORKSPACE_BUNDLES;
       targetId = IPDELauncherConstants.TARGET_BUNDLES;
     }
-    Set set = new HashSet();
-    Map map = BundleLauncherHelper.getWorkspaceBundleMap( launchConfig,
+    Set<String> set = new HashSet<String>();
+    Map<IPluginModelBase, String> map = BundleLauncherHelper.getWorkspaceBundleMap(launchConfig,
                                                           set,
                                                           workspaceId );
     map.putAll( BundleLauncherHelper.getTargetBundleMap( launchConfig,
diff --git a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/validation/PluginStatusDialogLableProvider.java b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/validation/PluginStatusDialogLableProvider.java
index b462162..7b4df5e 100644
--- a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/validation/PluginStatusDialogLableProvider.java
+++ b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/validation/PluginStatusDialogLableProvider.java
@@ -40,7 +40,7 @@
     return result;
   }
 
-  private Image getValidationErrorImage( final Object element ) {
+  private static Image getValidationErrorImage( final Object element ) {
     PDELabelProvider pdeLabelProvider 
       = PDEPlugin.getDefault().getLabelProvider();
     Image result;
diff --git a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/validation/WARProductValidateAction.java b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/validation/WARProductValidateAction.java
index 87d63a1..87d134f 100644
--- a/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/validation/WARProductValidateAction.java
+++ b/plugins/org.eclipse.libra.warproducts.ui/src/org/eclipse/libra/warproducts/ui/validation/WARProductValidateAction.java
@@ -10,6 +10,7 @@
 package org.eclipse.libra.warproducts.ui.validation;
 
 import java.util.*;
+import java.util.Map.Entry;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
@@ -32,7 +33,7 @@
 public class WARProductValidateAction extends Action {
 
   IWARProduct product;
-  List listeners;
+  List<IValidationListener> listeners;
 
   public WARProductValidateAction( final IWARProduct product ) {
     super( Messages.ValidateActionTitle, IAction.AS_PUSH_BUTTON );
@@ -42,7 +43,7 @@
   
   public void addValidationListener( final IValidationListener listener ) {
     if( listeners == null ) {
-      listeners = new ArrayList();
+      listeners = new ArrayList<IValidationListener>();
     }
     if( !listeners.contains( listener ) ) {
       listeners.add( listener );
@@ -50,7 +51,7 @@
   }
 
   public void run() {
-    HashMap map = new HashMap();
+    HashMap<String,IPluginModelBase> map = new HashMap<String,IPluginModelBase>();
     IProductPlugin[] plugins = product.getPlugins();
     for( int i = 0; i < plugins.length; i++ ) {
       String id = plugins[ i ].getId();
@@ -59,7 +60,7 @@
     validate( map );
   }
 
-  private void addBundleIfExisting( final HashMap map, final String id ) {
+  private static void addBundleIfExisting( final Map<String,IPluginModelBase> map, final String id ) {
     if( id != null && !map.containsKey( id ) ) {
       IPluginModelBase model = PluginRegistry.findModel( id );
       if( bundleExist( id, model ) ) {
@@ -68,7 +69,7 @@
     }
   }
   
-  private boolean bundleExist( final String id, final IPluginModelBase model ) {
+  private static boolean bundleExist( final String id, final IPluginModelBase model ) {
     boolean result = false;
     if( model != null ) {
       boolean matchesCurrentEnvironment 
@@ -80,11 +81,10 @@
     return result;
   }
 
-  private void validate( final HashMap map ) {
+  private void validate( final Map<String,IPluginModelBase> map ) {
     try {
       IPluginModelBase[] baseModel = new IPluginModelBase[ map.size() ];
-      Object[] array = map.values().toArray( baseModel );
-      IPluginModelBase[] models = ( IPluginModelBase[] )array;
+      IPluginModelBase[] models  = map.values().toArray( baseModel );
       LaunchValidationOperation operation 
         = new ProductValidationOperation( models );
       operation.run( new NullProgressMonitor() );
@@ -96,8 +96,8 @@
 
   private void verifyResult( final LaunchValidationOperation operation )
   {
-    Map errors = operation.getInput();
-    varifyPDEErrors( errors );
+    Map<Object,Object[]> errors = operation.getInput();
+    verifyPDEErrors( errors );
     validateWarContent( errors );
     notifyListeners( errors );
   }
@@ -105,19 +105,16 @@
   private void notifyListeners( final Map errors ) {
     if( listeners != null ) {
       for( int i = 0; i < listeners.size(); i++ ) {
-        IValidationListener listener 
-          = ( IValidationListener )listeners.get( i );
+        IValidationListener listener = listeners.get( i );
         listener.validationFinished( errors );
       }
     }
   }
 
-  private void varifyPDEErrors( final Map map ) {
-    Object[] keys = new Object[ map.size() ];
-    map.keySet().toArray( keys );
-    for( int i = 0; i < keys.length; i++ ) {
-      Object currentKey = keys[ i ];
-      ResolverError[] errors = ( ResolverError[] )map.get( currentKey );
+  private static void verifyPDEErrors( final Map<Object,Object[]> map ) {
+    for(final Entry<?,?> entry: map.entrySet()){
+      Object currentKey = entry.getKey();
+      ResolverError[] errors = (ResolverError[]) entry.getValue();
       ResolverError[] validErrors = validateErrors( errors );
       map.remove( currentKey );
       if( validErrors.length > 0 ) {
@@ -126,8 +123,8 @@
     }
   }
   
-  private ResolverError[] validateErrors( final ResolverError[] errors ) {
-    List validErrors = new ArrayList();
+  private static ResolverError[] validateErrors( final ResolverError[] errors ) {
+    List<ResolverError> validErrors = new ArrayList<ResolverError>();
     for( int i = 0; i < errors.length; i++ ) {
       ResolverError error = errors[ i ];
       VersionConstraint constraint = error.getUnsatisfiedConstraint();
@@ -149,7 +146,7 @@
     return result;
   }
 
-  private boolean isBanned( final String unresolvedBundleId ) {
+  private static boolean isBanned( final String unresolvedBundleId ) {
     boolean result = false;
     String[] bannedBundles = Validator.BANNED_BUNDLES;
     for( int i = 0; i < bannedBundles.length && !result; i++ ) {
@@ -160,15 +157,15 @@
     return result;
   }
 
-  private void validateWarContent( final Map map ) {
+  private void validateWarContent( final Map<Object,Object[]> map ) {
     Validator validator = new Validator( product );
     Validation validation = validator.validate();
     if( !validation.isValid() ) {
-      handleWARValiadtionErrors( map, validation.getErrors() );
+      handleWARValidationErrors( map, validation.getErrors() );
     }
   }
 
-  private void handleWARValiadtionErrors( final Map map, 
+  private static void handleWARValidationErrors( final Map<Object,Object[]> map, 
                                           final ValidationError[] errors ) 
   {
     String key = Messages.ValidateAction;
diff --git a/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/InfrastructureCreatorTest.java b/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/InfrastructureCreatorTest.java
index 044709c..a5c2bec 100644
--- a/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/InfrastructureCreatorTest.java
+++ b/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/InfrastructureCreatorTest.java
@@ -28,7 +28,7 @@
     tempDir = createTempDir();
   }
   
-  private IFolder createTempDir() throws CoreException {
+  private static IFolder createTempDir() throws CoreException {
     IWorkspace workspace = ResourcesPlugin.getWorkspace();
     IWorkspaceRoot root = workspace.getRoot();
     IProject project = root.getProject( TEMP_PROJECT );
@@ -151,7 +151,7 @@
     assertTrue( exceptionThrown );
   }
 
-  private StringBuffer readFile( final InputStream fileStream ) 
+  private static StringBuffer readFile( final InputStream fileStream ) 
     throws IOException
   {
     InputStreamReader streamReader = new InputStreamReader( fileStream );
diff --git a/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/ValidatorTest.java b/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/ValidatorTest.java
index d586fb4..e573d9a 100644
--- a/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/ValidatorTest.java
+++ b/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/ValidatorTest.java
@@ -178,7 +178,7 @@
     checkForBannedBundle( id );
   }
 
-  private void checkForBannedBundle( final String id ) throws Exception 
+  private static void checkForBannedBundle( final String id ) throws Exception 
   {
     IWARProduct product = createBasicProductWithLibraries();
     IProductPlugin plugin = new ProductPlugin( product.getModel() );
@@ -226,7 +226,7 @@
     checkForMissingRequiredBundle( id );
   }
   
-  private void checkForMissingRequiredBundle( final String id ) 
+  private static void checkForMissingRequiredBundle( final String id ) 
     throws IOException 
   {
     IWARProduct product = createPlainProducttWithLibraries();
@@ -251,7 +251,7 @@
     assertTrue( foundMissingBundle );
   }
 
-  private IWARProduct createBasicProductWithLibraries() throws Exception {
+  private static IWARProduct createBasicProductWithLibraries() throws Exception {
     IWARProduct product = createBasicProduct();
     IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
     IProject project = wsRoot.getProject( "warProduct" );
@@ -277,7 +277,7 @@
     return product;
   }
 
-  private IWARProduct createBasicProduct() {
+  private static IWARProduct createBasicProduct() {
     WARProductModel model = new WARProductModel();
     WARProductModelFactory factory = new WARProductModelFactory( model );
     String requiredBundles[] = Validator.REQUIRED_BUNDLES;
@@ -288,7 +288,7 @@
     return product;
   }
   
-  private IWARProduct createPlainProducttWithLibraries() throws IOException {
+  private static IWARProduct createPlainProducttWithLibraries() throws IOException {
     IWARProduct product = createPlainProduct();
     File testJar = File.createTempFile( "test", ".jar" );
     Path testPath = new Path( testJar.getAbsolutePath() );
@@ -300,14 +300,14 @@
     return product;
   }
   
-  private IWARProduct createPlainProduct() {
+  private static IWARProduct createPlainProduct() {
     WARProductModel model = new WARProductModel();
     WARProductModelFactory factory = new WARProductModelFactory( model );
     IWARProduct product = ( IWARProduct )factory.createProduct();
     return product;
   }
 
-  private void addBundleToProduct( final WARProductModelFactory factory, 
+  private static void addBundleToProduct( final WARProductModelFactory factory, 
                                    final String id, 
                                    final IWARProduct product ) 
   {
diff --git a/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductExportOperationTest.java b/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductExportOperationTest.java
index e376336..cca696f 100644
--- a/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductExportOperationTest.java
+++ b/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductExportOperationTest.java
@@ -14,8 +14,6 @@
 import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 
-import junit.framework.TestCase;
-
 import org.eclipse.core.resources.*;
 import org.eclipse.core.runtime.*;
 import org.eclipse.libra.warproducts.core.*;
@@ -27,6 +25,8 @@
 import org.eclipse.pde.internal.core.iproduct.IProduct;
 import org.osgi.framework.Version;
 
+import junit.framework.TestCase;
+
 
 public class WARProductExportOperationTest extends TestCase {
   
@@ -38,7 +38,7 @@
   protected void setUp() throws Exception {
   }
   
-  private IFolder createTempDir() throws CoreException {
+  private static IFolder createTempDir() throws CoreException {
     IWorkspace workspace = ResourcesPlugin.getWorkspace();
     IWorkspaceRoot root = workspace.getRoot();
     IProject project = root.getProject( "warProject" );
@@ -57,10 +57,10 @@
     deleteWarFile();
   }
   
-  private void deleteWarFile() {
+  private static void deleteWarFile() {
     File war = new File( WAR_FILE_PATH );
     if( war.exists() ) {
-      war.delete();
+      war.delete(); // TODO File.delete() check return code
     }
   }
   
@@ -70,7 +70,7 @@
     testWARContents( war );
   }
 
-  private IFolder getLinkedFolder() throws CoreException, IOException {
+  private static IFolder getLinkedFolder() throws CoreException, IOException {
     IWorkspace workspace = ResourcesPlugin.getWorkspace();
     IWorkspaceRoot root = workspace.getRoot();
     IProject project = root.getProject( "testLinkedResources" );
@@ -96,9 +96,9 @@
     testWARContents( war );
   }
 
-  private void testWARContents( final File war ) throws Exception
+  private static void testWARContents( final File war ) throws Exception
   {
-    List warEntryList = extractWarEntriesAsString( war );
+    List<String> warEntryList = extractWarEntriesAsString( war );
     testWARFileRootIsWebInf( warEntryList );
     testWARFileContainsWebXML( warEntryList );
     testWARFileContainsLibFolder( warEntryList );
@@ -108,55 +108,55 @@
     testLibContainsJar( warEntryList );
   }
   
-  private void testWARFileRootIsWebInf( final List warEntryList ) 
+  private static void testWARFileRootIsWebInf( final List<String> warEntryList ) 
     throws Exception 
   {
     assertTrue( warEntryList.contains( "WEB-INF/" ) );
   }
   
-  private void testWARFileContainsWebXML( final List warEntryList ) 
+  private static void testWARFileContainsWebXML( final List<String> warEntryList ) 
     throws Exception 
   {
     assertTrue( warEntryList.contains( "WEB-INF/web.xml" ) );
   }
   
-  private  void testWARFileContainsLibFolder( final List warEntryList) 
+  private static  void testWARFileContainsLibFolder( final List<String> warEntryList) 
     throws Exception 
   {
     assertTrue( warEntryList.contains( "WEB-INF/lib/" ) );
   }
   
-  private void testWebInfFolderContainsLaunchIni( final List warEntryList ) 
+  private static void testWebInfFolderContainsLaunchIni( final List<String> warEntryList ) 
     throws Exception 
   {
     assertTrue( warEntryList.contains( "WEB-INF/launch.ini" ) );
   }
   
-  public void testWebInfFolderContainsPlugins( final List warEntryList ) 
+  public void testWebInfFolderContainsPlugins( final List<?> warEntryList ) 
     throws Exception 
   {
     assertTrue( warEntryList.contains( "WEB-INF/plugins/" ) );
   }
   
-  private void testDidntContainsDotEclipseProduct( final List warEntryList ) 
+  private static void testDidntContainsDotEclipseProduct( final List<String> warEntryList ) 
     throws Exception 
   {
     assertTrue( !warEntryList.contains( "WEB-INF/.eclipseproduct" ) );
   }
   
-  private void testLibContainsJar( final List warEntryList ) 
+  private static void testLibContainsJar( final List<String> warEntryList ) 
   throws Exception 
 {
   String path = "WEB-INF/lib/test.jar";
   assertTrue( warEntryList.contains( path ) );
 }
 
-  private List extractWarEntriesAsString( File war )
+  private static List<String> extractWarEntriesAsString( File war )
     throws ZipException, IOException
   {
     ZipFile zip = new ZipFile( war );
-    List warEntryList = new ArrayList();
-    Enumeration entries = zip.entries();
+    List<String> warEntryList = new ArrayList<String>();
+    Enumeration<?> entries = zip.entries();
     while( entries.hasMoreElements() ) {
       Object nextElement = entries.nextElement();
       warEntryList.add( nextElement.toString() );
@@ -212,7 +212,7 @@
     return job;
   }
 
-  private FeatureExportInfo configureFeatureExport( final IWARProduct product ) 
+  private static FeatureExportInfo configureFeatureExport( final IWARProduct product ) 
   {
     FeatureExportInfo info = new FeatureExportInfo();
     info.toDirectory = false;
@@ -232,8 +232,8 @@
     return getClass().getResourceAsStream( "/test.warproduct" );
   }
 
-  private BundleDescription[] getPluginModels( final IProduct product ) {
-    ArrayList list = new ArrayList();
+  private static BundleDescription[] getPluginModels( final IProduct product ) {
+    ArrayList<BundleDescription> list = new ArrayList<BundleDescription>();
     State state = TargetPlatformHelper.getState();
     IProductPlugin[] plugins = product.getPlugins();
     for( int i = 0; i < plugins.length; i++ ) {
diff --git a/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductInitializerTest.java b/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductInitializerTest.java
index f0c24c3..33b327a 100644
--- a/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductInitializerTest.java
+++ b/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductInitializerTest.java
@@ -38,11 +38,10 @@
     assertTrue( validation.isValid() );
   }
 
-  private IProductPlugin[] createFakeEnvironment( 
-    final WARProductModelFactory factory ) 
+  private static IProductPlugin[] createFakeEnvironment( final WARProductModelFactory factory ) 
   {
     String[] bundles = Validator.REQUIRED_BUNDLES;
-    List bundleList = new ArrayList();
+    List<IProductPlugin> bundleList = new ArrayList<IProductPlugin>();
     for( int i = 0; i < bundles.length; i++ ) {
       IProductPlugin plugin = factory.createPlugin();
       plugin.setId( bundles[ i ] );
@@ -58,7 +57,7 @@
     return result;
   }
   
-  private void addFakeServletBridge( final IWARProduct product ) 
+  private static void addFakeServletBridge( final IWARProduct product ) 
     throws Exception 
   {
     String bridgeId = "org.eclipse.equinox.servletbridge";
diff --git a/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductModelTest.java b/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductModelTest.java
index e132798..b11347c 100644
--- a/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductModelTest.java
+++ b/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductModelTest.java
@@ -74,7 +74,7 @@
     assertTrue( file.exists() );
   }
 
-  private void setUpProject() throws Exception  {
+  private static void setUpProject() throws Exception  {
     IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
     IProject project = root.getProject( "test.rap" );
     if( !project.exists() ) {
diff --git a/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductTest.java b/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductTest.java
index 9908568..ef322a3 100644
--- a/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductTest.java
+++ b/tests/org.eclipse.libra.warproducts.core.test/src/org/eclipse/libra/warproducts/core/test/tests/WARProductTest.java
@@ -82,7 +82,7 @@
   }
   
   public void testWrite() {
-    String xml = writenXmlFromProduct();
+    String xml = writtenXmlFromProduct();
     assertTrue( xml.indexOf( "<warConfiguration webXml=\"/test/web.xml" + "\" " 
                              + "launchIni=\"/test/launch.ini" 
                              + "\">" ) > -1 );
@@ -101,7 +101,7 @@
   }
   
   public void testParse() throws CoreException {
-    String xml = writenXmlFromProduct();
+    String xml = writtenXmlFromProduct();
     WARProductModel model = new WARProductModel();
     InputStream stream = new ByteArrayInputStream( xml.getBytes() );
     model.load( stream, false );
@@ -143,7 +143,7 @@
     }
   }
 
-  private String writenXmlFromProduct() {
+  private static String writtenXmlFromProduct() {
     WARProductModel model = new WARProductModel();
     WARProductModelFactory factory = new WARProductModelFactory( model );
     IWARProduct product = ( IWARProduct )factory.createProduct();
@@ -190,7 +190,7 @@
     assertFalse( product.isLibraryFromTarget( jarPath2 ) );
   }
   
-  private String getAbsoluteFilePath( final String folder, final String file ) {
+  private static String getAbsoluteFilePath( final String folder, final String file ) {
     return File.separator + folder + File.separator + file;
   }