[CIShell-SVN] SF.net SVN: cishell: [693] trunk/templates/org.cishell.templates

[<bh...@us...>]

Revision: 693
          http://cishell.svn.sourceforge.net/cishell/?rev=693&view=rev
Author:   bh2
Date:     2008-03-25 08:13:37 -0700 (Tue, 25 Mar 2008)

Log Message:
-----------
updated to cishell 1.0 spec

Modified Paths:
--------------
    trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF
    trunk/templates/org.cishell.templates/src/org/cishell/templates/dataset/DatasetFactory.java
    trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java

Modified: trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF
===================================================================
--- trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF	2008-03-25 15:13:32 UTC (rev 692)
+++ trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF	2008-03-25 15:13:37 UTC (rev 693)
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: CIShell Template Code Provider
 Bundle-SymbolicName: org.cishell.templates;singleton:=true
-Bundle-Version: 0.9.0
+Bundle-Version: 1.0.0
 Bundle-Localization: plugin
 X-AutoStart: true
-Import-Package: org.cishell.framework,
- org.cishell.framework.algorithm,
- org.cishell.framework.data,
- org.cishell.service.guibuilder,
+Import-Package: org.cishell.framework;version="1.0.0",
+ org.cishell.framework.algorithm;version="1.0.0",
+ org.cishell.framework.data;version="1.0.0",
+ org.cishell.service.guibuilder;version="1.0.0",
  org.osgi.framework;version="1.3.0",
  org.osgi.service.component;version="1.0.0",
  org.osgi.service.log;version="1.3.0",

Modified: trunk/templates/org.cishell.templates/src/org/cishell/templates/dataset/DatasetFactory.java
===================================================================
--- trunk/templates/org.cishell.templates/src/org/cishell/templates/dataset/DatasetFactory.java	2008-03-25 15:13:32 UTC (rev 692)
+++ trunk/templates/org.cishell.templates/src/org/cishell/templates/dataset/DatasetFactory.java	2008-03-25 15:13:37 UTC (rev 693)
@@ -87,7 +87,7 @@
         public Data[] execute() {
             try {
                 Data data = new BasicData(getDataset(),format);
-                data.getMetaData().put(DataProperty.LABEL, label);
+                data.getMetadata().put(DataProperty.LABEL, label);
             
                 return new Data[]{data};
             } catch (IOException e) {

Modified: trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java
===================================================================
--- trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java	2008-03-25 15:13:32 UTC (rev 692)
+++ trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java	2008-03-25 15:13:37 UTC (rev 693)
@@ -124,7 +124,7 @@
 
 					String label = props.getProperty(
 							"outFile[" + i + "].label", f.getName());
-					data[i].getMetaData().put(DataProperty.LABEL, label);
+					data[i].getMetadata().put(DataProperty.LABEL, label);
 
 					String type = props.getProperty("outFile[" + i + "].type",
 							DataProperty.OTHER_TYPE);
@@ -137,13 +137,15 @@
 						type = DataProperty.TREE_TYPE;
 					} else if (type.equalsIgnoreCase(DataProperty.TEXT_TYPE)) {
 						type = DataProperty.TEXT_TYPE;
-					} else if (type.equalsIgnoreCase(DataProperty.GRACE_TYPE)) {
-						type = DataProperty.GRACE_TYPE;
-					} else {
+					} else if (type.equalsIgnoreCase(DataProperty.PLOT_TYPE)) {
+						type = DataProperty.PLOT_TYPE;
+					} else if (type.equalsIgnoreCase(DataProperty.TABLE_TYPE)) {
+						type = DataProperty.TABLE_TYPE;
+					}else {
 						type = DataProperty.OTHER_TYPE;
 					}
 
-					data[i].getMetaData().put(DataProperty.TYPE, type);
+					data[i].getMetadata().put(DataProperty.TYPE, type);
 				}
 			} else {
 				Iterator iter = nameToFileMap.values().iterator();
@@ -151,7 +153,7 @@
 					File f = (File) iter.next();
 
 					data[i] = new BasicData(f, "file:text/plain");
-					data[i].getMetaData().put(DataProperty.LABEL, f.getName());
+					data[i].getMetadata().put(DataProperty.LABEL, f.getName());
 
 					i++;
 				}


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