[CIShell-SVN] SF.net SVN: cishell:[1075] trunk/core/org.cishell.framework

[<pat...@us...>]

Revision: 1075
          http://cishell.svn.sourceforge.net/cishell/?rev=1075&view=rev
Author:   pataphil
Date:     2010-06-20 19:16:46 +0000 (Sun, 20 Jun 2010)

Log Message:
-----------
* Changed signature of AlgorithmFactory.createAlgorithm to specify Dictionary K, V types, updating it to Java 1.5 (as opposed to using the Java 1.4 raw Dictionary).
* If it breaks anything (which it shouldn't), I'll change it back.

Modified Paths:
--------------
    trunk/core/org.cishell.framework/.classpath
    trunk/core/org.cishell.framework/.settings/org.eclipse.jdt.core.prefs
    trunk/core/org.cishell.framework/META-INF/MANIFEST.MF
    trunk/core/org.cishell.framework/src/org/cishell/framework/algorithm/AlgorithmFactory.java

Modified: trunk/core/org.cishell.framework/.classpath
===================================================================
--- trunk/core/org.cishell.framework/.classpath	2010-06-16 23:00:57 UTC (rev 1074)
+++ trunk/core/org.cishell.framework/.classpath	2010-06-20 19:16:46 UTC (rev 1075)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Modified: trunk/core/org.cishell.framework/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/core/org.cishell.framework/.settings/org.eclipse.jdt.core.prefs	2010-06-16 23:00:57 UTC (rev 1074)
+++ trunk/core/org.cishell.framework/.settings/org.eclipse.jdt.core.prefs	2010-06-20 19:16:46 UTC (rev 1075)
@@ -1,12 +1,12 @@
-#Wed Feb 06 22:39:13 GMT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
+#Fri Jun 11 22:41:08 EDT 2010
+eclipse.preferences.version=1
+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
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

Modified: trunk/core/org.cishell.framework/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/org.cishell.framework/META-INF/MANIFEST.MF	2010-06-16 23:00:57 UTC (rev 1074)
+++ trunk/core/org.cishell.framework/META-INF/MANIFEST.MF	2010-06-20 19:16:46 UTC (rev 1075)
@@ -4,6 +4,7 @@
 Bundle-SymbolicName: org.cishell.framework
 Bundle-Version: 1.0.0
 Bundle-Vendor: Cyberinfrastructure for Network Science Center
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: org.osgi.framework,
  org.osgi.service.log,
  org.osgi.service.metatype,

Modified: trunk/core/org.cishell.framework/src/org/cishell/framework/algorithm/AlgorithmFactory.java
===================================================================
--- trunk/core/org.cishell.framework/src/org/cishell/framework/algorithm/AlgorithmFactory.java	2010-06-16 23:00:57 UTC (rev 1074)
+++ trunk/core/org.cishell.framework/src/org/cishell/framework/algorithm/AlgorithmFactory.java	2010-06-20 19:16:46 UTC (rev 1075)
@@ -51,7 +51,6 @@
      *                   standard CIShell services
      * @return An <code>Algorithm</code> primed for execution
      */
-    public Algorithm createAlgorithm(Data[] data, 
-                                     Dictionary parameters,
-                                     CIShellContext context);
+    public Algorithm createAlgorithm(
+    		Data[] data, Dictionary<String, Object> parameters, CIShellContext context);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.