Cleanup.

8 files changed, 18 insertions, 60 deletions

diff --git a/org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java b/org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java
index e04a028..f583b1a 100644
--- a/org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java
+++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/Activator.java
@@ -18,7 +18,6 @@ import java.io.IOException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 import org.osgi.framework.BundleContext;
-import org.rtems.cdt.Constants;
 
 public class Activator extends AbstractUIPlugin {
 	private static Activator mPlugin;
diff --git a/org.rtems.cdt.toolchain2/org/rtems/cdt/Storage.java b/org.rtems.cdt.toolchain2/org/rtems/cdt/Storage.java
index 22be333..9826b00 100644
--- a/org.rtems.cdt.toolchain2/org/rtems/cdt/Storage.java
+++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/Storage.java
@@ -22,10 +22,7 @@ import java.util.Map;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.QualifiedName;
-import org.rtems.cdt.Activator;
 
 public class Storage {
 	private static final String OPTION_SEPARATOR = "\0";
diff --git a/org.rtems.cdt.toolchain2/org/rtems/cdt/VolatilePreferenceStore.java b/org.rtems.cdt.toolchain2/org/rtems/cdt/VolatilePreferenceStore.java
index 546ace0..eca7053 100644
--- a/org.rtems.cdt.toolchain2/org/rtems/cdt/VolatilePreferenceStore.java
+++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/VolatilePreferenceStore.java
@@ -17,10 +17,6 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceStore;
 
 public class VolatilePreferenceStore extends PreferenceStore implements IPreferenceStore {
-	public VolatilePreferenceStore() {
-		// Do nothing
-	}
-	
 	public void save() {
 		// Do nothing
 	}
diff --git a/org.rtems.cdt.toolchain2/org/rtems/cdt/build/EnvironmentSupplier.java b/org.rtems.cdt.toolchain2/org/rtems/cdt/build/EnvironmentSupplier.java
index d8decf5..2099038 100644
--- a/org.rtems.cdt.toolchain2/org/rtems/cdt/build/EnvironmentSupplier.java
+++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/build/EnvironmentSupplier.java
@@ -27,10 +27,6 @@ public class EnvironmentSupplier implements IProjectEnvironmentVariableSupplier
 	private static final int PATH_INDEX = 0;
 	
 	private static final int VARIABLE_COUNT = 1;
-	
-	public EnvironmentSupplier() {
-		// Do nothing
-	}
 
 	public IBuildEnvironmentVariable getVariable( String name, IManagedProject project, IEnvironmentVariableProvider provider) {
 		if (name.equals( "PATH")) {
@@ -48,8 +44,6 @@ public class EnvironmentSupplier implements IProjectEnvironmentVariableSupplier
 	public IBuildEnvironmentVariable [] getVariables( IManagedProject project, IEnvironmentVariableProvider provider) {
 		IBuildEnvironmentVariable variables [] = new IBuildEnvironmentVariable [VARIABLE_COUNT];
 		
-		// System.out.println( Constants.getCounter() + ": getVariables");
-		
 		variables [PATH_INDEX] = getVariable( "PATH", project, provider);
 		
 		return variables;
diff --git a/org.rtems.cdt.toolchain2/org/rtems/cdt/build/MacroSupplier.java b/org.rtems.cdt.toolchain2/org/rtems/cdt/build/MacroSupplier.java
deleted file mode 100644
index 819c4ab..0000000
--- a/org.rtems.cdt.toolchain2/org/rtems/cdt/build/MacroSupplier.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2008
- * Embedded Brains GmbH
- * Obere Lagerstr. 30
- * D-82178 Puchheim
- * Germany
- * rtems@embedded-brains.de
- *
- * The license and distribution terms for this file may be found in the file
- * LICENSE in this distribution or at http://www.rtems.com/license/LICENSE.
- */
-
-package org.rtems.cdt.build;
-
-import org.eclipse.cdt.managedbuilder.core.IManagedProject;
-import org.eclipse.cdt.managedbuilder.macros.IBuildMacro;
-import org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider;
-import org.eclipse.cdt.managedbuilder.macros.IProjectBuildMacroSupplier;
-
-public class MacroSupplier implements IProjectBuildMacroSupplier {
-	public MacroSupplier() {
-		// Do nothing
-	}
-
-	public IBuildMacro getMacro( String macroName, IManagedProject project, IBuildMacroProvider provider) {
-		// TODO
-		return null;	
-	}
-
-	public IBuildMacro [] getMacros( IManagedProject project, IBuildMacroProvider provider) {
-		// TODO
-		return null;
-	}
-}
diff --git a/org.rtems.cdt.toolchain2/org/rtems/cdt/preferences/PreferencePage.java b/org.rtems.cdt.toolchain2/org/rtems/cdt/preferences/PreferencePage.java
index 9848a5d..bf9890e 100644
--- a/org.rtems.cdt.toolchain2/org/rtems/cdt/preferences/PreferencePage.java
+++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/preferences/PreferencePage.java
@@ -12,7 +12,8 @@
 
 package org.rtems.cdt.preferences;
 
-import org.eclipse.jface.preference.*;
+import org.eclipse.jface.preference.DirectoryFieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.ui.IWorkbenchPreferencePage;
 import org.eclipse.ui.IWorkbench;
 import org.rtems.cdt.Activator;
diff --git a/org.rtems.cdt.toolchain2/org/rtems/cdt/wizards/BasicSetup.java b/org.rtems.cdt.toolchain2/org/rtems/cdt/wizards/BasicSetup.java
index b622a29..8846e6a 100644
--- a/org.rtems.cdt.toolchain2/org/rtems/cdt/wizards/BasicSetup.java
+++ b/org.rtems.cdt.toolchain2/org/rtems/cdt/wizards/BasicSetup.java
@@ -15,11 +15,19 @@ package org.rtems.cdt.wizards;
 import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPage;
 import org.eclipse.cdt.managedbuilder.ui.wizards.MBSCustomPageManager;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.events.*;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.SWT;
 import org.rtems.cdt.Constants;
 import org.rtems.cdt.Storage;
diff --git a/org.rtems.cdt.toolchain2/plugin.xml b/org.rtems.cdt.toolchain2/plugin.xml
index 0a57e96..610f80d 100644
--- a/org.rtems.cdt.toolchain2/plugin.xml
+++ b/org.rtems.cdt.toolchain2/plugin.xml
@@ -7,7 +7,7 @@
    D-82178 Puchheim
    Germany
    rtems@embedded-brains.de
-   
+
    The license and distribution terms for this file may be found in the file
    LICENSE in this distribution or at http://www.rtems.com/license/LICENSE.
 -->
@@ -299,15 +299,12 @@
          </tool>
       </toolChain>
 
-      <!-- Toolchain (MinGW) -->
-
       <!-- Project Type -->
       <projectType
             buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe"
             id="org.rtems.cdt.projectType"
             name="RTEMS Executable"
-            projectEnvironmentSupplier="org.rtems.cdt.build.EnvironmentSupplier"
-            projectMacroSupplier="org.rtems.cdt.build.MacroSupplier">
+            projectEnvironmentSupplier="org.rtems.cdt.build.EnvironmentSupplier">
          <configuration
                id="org.rtems.cdt.config"
                name="RTEMS Executable Configuration"
@@ -328,7 +325,7 @@
          </configuration>
       </projectType>
    </extension>
-   
+
    <!-- New Project Wizard -->
    <extension
          point="org.eclipse.cdt.managedbuilder.ui.newWizardPages">
@@ -337,7 +334,7 @@
             operationClass="org.rtems.cdt.wizards.FinishSetup"
             pageClass="org.rtems.cdt.wizards.BasicSetup"/>
    </extension>
-   
+
    <!-- Preferences -->
    <extension
          point="org.eclipse.ui.preferencePages">
@@ -353,7 +350,7 @@
       <initializer
             class="org.rtems.cdt.preferences.PreferenceInitializer"/>
    </extension>
-   
+
    <!-- Properties -->
    <extension
          point="org.eclipse.ui.propertyPages">
@@ -373,7 +370,7 @@
                <instanceof value="org.eclipse.core.resources.IFile"/>
                <instanceof value="org.eclipse.core.resources.IFolder"/>
                <instanceof value="org.eclipse.core.resources.IProject"/>
-            </or>          
+            </or>
          </enabledWhen>
       </page>
    </extension>