fixed feature and update site

Jonathan Bell [2011-11-02 14:54:31]
fixed feature and update site
Filename
halo-se-feature/feature.xml
halo-se/META-INF/MANIFEST.MF
halo-se/src/edu/columbia/cs/psl/halo/client/views/DashboardComposite.java
halo-se/src/edu/columbia/cs/psl/halo/client/views/LoginComposite.java
halo-update-site/artifacts.jar
halo-update-site/content.jar
halo-update-site/site.xml
diff --git a/halo-se-feature/feature.xml b/halo-se-feature/feature.xml
index ac9ae0d..97f2261 100644
--- a/halo-se-feature/feature.xml
+++ b/halo-se-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="edu.columbia.cs.psl.halo.client"
       label="HALO SE Client Environment"
-      version="1.0.1.3">
+      version="1.0.1.5">

    <description url="http://www.example.com/description">
       [Enter Feature Description here.]
@@ -16,6 +16,10 @@
       [Enter License Description here.]
    </license>

+   <requires>
+      <import plugin="org.eclipse.ui.forms"/>
+   </requires>
+
    <plugin
          id="edu.columbia.cs.psl.halo.client"
          download-size="0"
@@ -23,4 +27,11 @@
          version="0.0.0"
          unpack="false"/>

+   <plugin
+         id="org.eclipse.ui.forms"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>
diff --git a/halo-se/META-INF/MANIFEST.MF b/halo-se/META-INF/MANIFEST.MF
index 082d9c1..0f0d33a 100644
--- a/halo-se/META-INF/MANIFEST.MF
+++ b/halo-se/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: edu.columbia.cs.psl.halo.client.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.ui.forms;bundle-version="3.5.100"
+ org.eclipse.ui.forms;bundle-version="3.5.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .,
diff --git a/halo-se/src/edu/columbia/cs/psl/halo/client/views/DashboardComposite.java b/halo-se/src/edu/columbia/cs/psl/halo/client/views/DashboardComposite.java
index 1aea875..659eab3 100644
--- a/halo-se/src/edu/columbia/cs/psl/halo/client/views/DashboardComposite.java
+++ b/halo-se/src/edu/columbia/cs/psl/halo/client/views/DashboardComposite.java
@@ -220,7 +220,7 @@ public class DashboardComposite extends Composite {

 	private void logoutButtonSelected(SelectionEvent e)
 	{
-		IEclipsePreferences node = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID);
+		IEclipsePreferences node = new InstanceScope().getNode(Activator.PLUGIN_ID);

 		node.remove("username");
 		node.remove("password");
diff --git a/halo-se/src/edu/columbia/cs/psl/halo/client/views/LoginComposite.java b/halo-se/src/edu/columbia/cs/psl/halo/client/views/LoginComposite.java
index 435e2cb..a6a263c 100644
--- a/halo-se/src/edu/columbia/cs/psl/halo/client/views/LoginComposite.java
+++ b/halo-se/src/edu/columbia/cs/psl/halo/client/views/LoginComposite.java
@@ -15,6 +15,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
+import org.eclipse.core.runtime.preferences.ConfigurationScope;
 import org.eclipse.core.runtime.preferences.DefaultScope;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IScopeContext;
@@ -142,7 +143,7 @@ public class LoginComposite extends Composite {
 		// fTextPassword.setText("test123");
 		// fTextUsername.setText("jon");
 		// handleButtonOKWidgetSelected();
-		IEclipsePreferences node = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID);
+		IEclipsePreferences node = new InstanceScope().getNode(Activator.PLUGIN_ID);
 		String username = node.get("username", null);
 		String pass = node.get("password", null);
 		if(username != null & pass != null)
@@ -321,8 +322,7 @@ public class LoginComposite extends Composite {
 						Display.getDefault().syncExec(new Runnable() {
 							public void run() {
 								progressBar.setVisible(false);
-
-								IEclipsePreferences node = InstanceScope.INSTANCE.getNode(Activator.PLUGIN_ID);
+								IEclipsePreferences node = new InstanceScope().getNode(Activator.PLUGIN_ID);
 								if(rememberMe.getSelection())
 								{
 									node.put("username", username);
diff --git a/halo-update-site/artifacts.jar b/halo-update-site/artifacts.jar
index 003708c..9d700ab 100644
Binary files a/halo-update-site/artifacts.jar and b/halo-update-site/artifacts.jar differ
diff --git a/halo-update-site/content.jar b/halo-update-site/content.jar
index 56ba54b..0f9ca86 100644
Binary files a/halo-update-site/content.jar and b/halo-update-site/content.jar differ
diff --git a/halo-update-site/site.xml b/halo-update-site/site.xml
index a942e6f..19c750e 100644
--- a/halo-update-site/site.xml
+++ b/halo-update-site/site.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/edu.columbia.cs.psl.halo.client_1.0.1.3.jar" id="edu.columbia.cs.psl.halo.client" version="1.0.1.3">
+   <feature url="features/edu.columbia.cs.psl.halo.client_1.0.1.5.jar" id="edu.columbia.cs.psl.halo.client" version="1.0.1.5">
       <category name="HALO"/>
    </feature>
    <category-def name="HALO" label="HALO SE"/>