Menu
▾
▴
cishell-svn — Mailing list for commit messages to CIShell
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(7) |
Aug
|
Sep
(46) |
Oct
(102) |
Nov
(10) |
Dec
(21) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(1) |
Feb
(3) |
Mar
(14) |
Apr
(9) |
May
(12) |
Jun
(4) |
Jul
(40) |
Aug
(60) |
Sep
(38) |
Oct
(2) |
Nov
(1) |
Dec
(42) |
| 2008 |
Jan
(23) |
Feb
(29) |
Mar
(107) |
Apr
(27) |
May
(3) |
Jun
(1) |
Jul
(15) |
Aug
(7) |
Sep
(19) |
Oct
|
Nov
(2) |
Dec
|
| 2009 |
Jan
(36) |
Feb
(4) |
Mar
(2) |
Apr
(1) |
May
(1) |
Jun
(15) |
Jul
(30) |
Aug
(32) |
Sep
(11) |
Oct
(21) |
Nov
(12) |
Dec
(15) |
| 2010 |
Jan
(29) |
Feb
(9) |
Mar
(25) |
Apr
|
May
(7) |
Jun
(5) |
Jul
(21) |
Aug
(32) |
Sep
(10) |
Oct
(8) |
Nov
(29) |
Dec
(8) |
| 2011 |
Jan
(9) |
Feb
(35) |
Mar
(11) |
Apr
(4) |
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
(3) |
Dec
(30) |
| 2012 |
Jan
(5) |
Feb
(7) |
Mar
(10) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
Revision: 702
http://cishell.svn.sourceforge.net/cishell/?rev=702&view=rev
Author: huangb
Date: 2008-03-25 09:24:52 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
replace getMetaData with getMetadata
catch and log AlgorithmExecutionException when invoke view or
save function by right clicking the selected data.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/AbstractDataManagerView.java
Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/AbstractDataManagerView.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/AbstractDataManagerView.java 2008-03-25 16:23:43 UTC (rev 701)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/AbstractDataManagerView.java 2008-03-25 16:24:52 UTC (rev 702)
@@ -25,6 +25,7 @@
import org.cishell.app.service.datamanager.DataManagerService;
import org.cishell.framework.algorithm.Algorithm;
import org.cishell.framework.algorithm.AlgorithmFactory;
+import org.cishell.framework.algorithm.AlgorithmExecutionException;
import org.cishell.framework.data.Data;
import org.cishell.framework.data.DataProperty;
import org.cishell.reference.gui.workspace.CIShellApplication;
@@ -105,17 +106,20 @@
private SaveListener saveListener;
private ViewListener viewListener;
private ViewWithListener viewWithListener;
+ private LogService log;
public AbstractDataManagerView(String brandPluginID) {
- manager = Activator.getDataManagerService();
+
this.brandPluginID = brandPluginID;
dataToDataGUIItemMap = new HashMap();
-
- if (manager == null) {
- LogService log = Activator.getLogService();
+
+ manager = Activator.getDataManagerService();
+ log = Activator.getLogService();
+
+ if (manager == null) {
if (log != null) {
log.log(LogService.LOG_ERROR, "Data Manager Service unavailable!");
- }
+ }
}
}
@@ -254,7 +258,7 @@
}
private DataGUIItem getParent(Data data) {
- Dictionary modelDictionary = data.getMetaData();
+ Dictionary modelDictionary = data.getMetadata();
Data parent = (Data) modelDictionary.get(DataProperty.PARENT);
DataGUIItem parentItem;
@@ -459,7 +463,7 @@
DataGUIItem treeItem = (DataGUIItem) item.getData();
Data model = treeItem.getModel();
- model.getMetaData().put(DataProperty.LABEL, newLabel);
+ model.getMetadata().put(DataProperty.LABEL, newLabel);
viewer.refresh();
newEditor.dispose();
@@ -493,7 +497,21 @@
Algorithm algorithm = saveFactory
.createAlgorithm(data, new Hashtable(), Activator
.getCIShellContext());
- algorithm.execute();
+ try{
+ algorithm.execute();
+ }catch (AlgorithmExecutionException aee) {
+ if (log != null) {
+ log.log(LogService.LOG_ERROR,
+ "org.cishell.framework.algorithm.AlgorithmExecutionException",
+ aee);
+ }
+ else {
+ log = Activator.getLogService();
+ log.log(LogService.LOG_ERROR,
+ "org.cishell.framework.algorithm.AlgorithmExecutionException",
+ aee);
+ }
+ }
}
}
}
@@ -506,7 +524,21 @@
Algorithm algorithm = viewFactory
.createAlgorithm(data, new Hashtable(), Activator
.getCIShellContext());
- algorithm.execute();
+ try {
+ algorithm.execute();
+ }catch (AlgorithmExecutionException aee) {
+ if (log != null) {
+ log.log(LogService.LOG_ERROR,
+ "org.cishell.framework.algorithm.AlgorithmExecutionException",
+ aee);
+ }
+ else {
+ log = Activator.getLogService();
+ log.log(LogService.LOG_ERROR,
+ "org.cishell.framework.algorithm.AlgorithmExecutionException",
+ aee);
+ }
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 16:24:06
|
Revision: 701
http://cishell.svn.sourceforge.net/cishell/?rev=701&view=rev
Author: bh2
Date: 2008-03-25 09:23:43 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
'properly' handling new metatype id stuff and parameter mutators. Still need to add in support for in/out data exceptions and other badly needed refactorings.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/Activator.java
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF 2008-03-25 15:53:46 UTC (rev 700)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF 2008-03-25 16:23:43 UTC (rev 701)
@@ -14,6 +14,7 @@
org.cishell.framework.algorithm;version="1.0.0",
org.cishell.framework.data;version="1.0.0",
org.cishell.reference.gui.workspace,
+ org.cishell.reference.service.metatype,
org.cishell.service.conversion;version="1.0.0",
org.cishell.service.guibuilder;version="1.0.0",
org.osgi.service.log;version="1.3.0",
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/Activator.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/Activator.java 2008-03-25 15:53:46 UTC (rev 700)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/Activator.java 2008-03-25 16:23:43 UTC (rev 701)
@@ -12,6 +12,7 @@
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
/**
* The activator class controls the plug-in life cycle
@@ -24,6 +25,8 @@
// The shared instance
private static Activator plugin;
+ private static BundleContext context;
+
MenuAdapter menuAdapter;
/**
@@ -39,6 +42,8 @@
public void start(BundleContext context) throws Exception {
super.start(context);
+ this.context = context;
+
while (getWorkbench() == null) {
Thread.sleep(500);
}
@@ -77,6 +82,16 @@
super.stop(context);
}
+
+ public static Object getService(String service_pid) {
+ ServiceReference ref = context.getServiceReference(service_pid);
+
+ if (ref != null) {
+ return context.getService(ref);
+ } else {
+ return null;
+ }
+ }
/**
* Returns the shared instance
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2008-03-25 15:53:46 UTC (rev 700)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2008-03-25 16:23:43 UTC (rev 701)
@@ -27,10 +27,13 @@
import org.cishell.framework.algorithm.AlgorithmFactory;
import org.cishell.framework.algorithm.AlgorithmProperty;
import org.cishell.framework.algorithm.DataValidator;
+import org.cishell.framework.algorithm.ParameterMutator;
import org.cishell.framework.algorithm.ProgressMonitor;
import org.cishell.framework.algorithm.ProgressTrackable;
import org.cishell.framework.data.Data;
import org.cishell.framework.data.DataProperty;
+import org.cishell.reference.gui.menumanager.Activator;
+import org.cishell.reference.service.metatype.BasicMetaTypeProvider;
import org.cishell.service.conversion.Converter;
import org.cishell.service.guibuilder.GUIBuilderService;
import org.osgi.framework.BundleContext;
@@ -39,6 +42,7 @@
import org.osgi.service.log.LogService;
import org.osgi.service.metatype.AttributeDefinition;
import org.osgi.service.metatype.MetaTypeProvider;
+import org.osgi.service.metatype.MetaTypeService;
import org.osgi.service.metatype.ObjectClassDefinition;
@@ -110,11 +114,34 @@
}
}
- //FIXME:
- //this.provider = factory.createParameters(data);
- this.provider = null;
String pid = (String)ref.getProperty(Constants.SERVICE_PID);
+ String metatype_pid = (String) ref.getProperty(PARAMETERS_PID);
+ if (metatype_pid == null) {
+ metatype_pid = pid;
+ }
+
+ this.provider = null;
+
+ MetaTypeService metaTypeService = (MetaTypeService) Activator.getService(MetaTypeService.class.getName());
+ if (metaTypeService != null) {
+ provider = metaTypeService.getMetaTypeInformation(ref.getBundle());
+ }
+
+ if (factory instanceof ParameterMutator && provider != null) {
+ try {
+ ObjectClassDefinition ocd = provider.getObjectClassDefinition(metatype_pid, null);
+
+ ocd = ((ParameterMutator) factory).mutateParameters(data, ocd);
+
+ if (ocd != null) {
+ provider = new BasicMetaTypeProvider(ocd);
+ }
+ } catch (IllegalArgumentException e) {
+ log(LogService.LOG_DEBUG, pid+" has an invalid metatype id: "+metatype_pid);
+ }
+ }
+
this.parameters = new Hashtable();
if (provider != null) {
this.parameters = builder.createGUIandWait(pid, provider);
@@ -167,6 +194,15 @@
}
}
+ protected void log(int logLevel, String message) {
+ LogService log = (LogService) Activator.getService(LogService.class.getName());
+ if (log != null) {
+ log.log(logLevel, message);
+ } else {
+ System.out.println(message);
+ }
+ }
+
protected void printParameters() {
LogService logger = getLogService();
setupIdToLabelMap();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2008-03-25 15:55:17
|
Revision: 700
http://cishell.svn.sourceforge.net/cishell/?rev=700&view=rev
Author: huangb
Date: 2008-03-25 08:53:46 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
replace getMetaData with getMetadata
replace GRACE_TYPE with PLOT_TYPE
replace GraceIcon with plotIcon
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java
Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java 2008-03-25 15:51:07 UTC (rev 699)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java 2008-03-25 15:53:46 UTC (rev 700)
@@ -37,7 +37,7 @@
private Image networkIcon;
private Image unknownIcon;
private Image textIcon;
- private Image graceIcon;
+ private Image plotIcon;
private Map typeToImageMapping;
@@ -63,7 +63,7 @@
networkIcon = createImage("network.png", this.brandPluginID);
unknownIcon = createImage("unknown.png", this.brandPluginID);
textIcon = createImage("text.png", this.brandPluginID);
- graceIcon = createImage("grace.png", this.brandPluginID);
+ plotIcon = createImage("grace.png", this.brandPluginID);
typeToImageMapping = new HashMap();
registerImage(DataProperty.OTHER_TYPE, unknownIcon);
@@ -71,7 +71,7 @@
registerImage(DataProperty.NETWORK_TYPE, networkIcon);
registerImage(DataProperty.TREE_TYPE, treeIcon);
registerImage(DataProperty.TEXT_TYPE, textIcon);
- registerImage(DataProperty.GRACE_TYPE, graceIcon);
+ registerImage(DataProperty.PLOT_TYPE, plotIcon);
}
/**
@@ -128,7 +128,7 @@
* @return the icon associated with this DataModel for display in IVC
*/
public Image getIcon(){
- Image icon = (Image)typeToImageMapping.get(data.getMetaData().get(DataProperty.TYPE));
+ Image icon = (Image)typeToImageMapping.get(data.getMetadata().get(DataProperty.TYPE));
if(icon == null) icon = unknownIcon;
return icon;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2008-03-25 15:53:37
|
Revision: 699
http://cishell.svn.sourceforge.net/cishell/?rev=699&view=rev
Author: huangb
Date: 2008-03-25 08:51:07 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
replace getMetaData with getMetadata
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataTreeLabelProvider.java
Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataTreeLabelProvider.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataTreeLabelProvider.java 2008-03-25 15:43:05 UTC (rev 698)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataTreeLabelProvider.java 2008-03-25 15:51:07 UTC (rev 699)
@@ -49,8 +49,8 @@
public String getText(Object element) {
if (element instanceof DataGUIItem) {
Data model = ((DataGUIItem) element).getModel();
- String label = (String) model.getMetaData().get(DataProperty.LABEL);
- // Boolean modified = (Boolean)model.getMetaData().get(DataProperty.MODIFIED);
+ String label = (String) model.getMetadata().get(DataProperty.LABEL);
+ // Boolean modified = (Boolean)model.getMetadata().get(DataProperty.MODIFIED);
/* if(modified != null && modified.booleanValue()){
label = ">" + label;
}*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2008-03-25 15:43:26
|
Revision: 698
http://cishell.svn.sourceforge.net/cishell/?rev=698&view=rev
Author: huangb
Date: 2008-03-25 08:43:05 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
update bundle-version to 1.0.0
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF
Modified: trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF 2008-03-25 15:33:54 UTC (rev 697)
+++ trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF 2008-03-25 15:43:05 UTC (rev 698)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CIShell Reference GUI Workspace Plug-in
Bundle-SymbolicName: org.cishell.reference.gui.workspace; singleton:=true
-Bundle-Version: 0.5.0
+Bundle-Version: 1.0.0
Bundle-Activator: org.cishell.reference.gui.workspace.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 15:34:47
|
Revision: 697
http://cishell.svn.sourceforge.net/cishell/?rev=697&view=rev
Author: bh2
Date: 2008-03-25 08:33:54 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
did simple updates to menumanager, but still needs to deal w/ parameters, better exception handling, and in/out data extension
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF 2008-03-25 15:25:26 UTC (rev 696)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF 2008-03-25 15:33:54 UTC (rev 697)
@@ -2,19 +2,19 @@
Bundle-ManifestVersion: 2
Bundle-Name: Menu Manager Plug-in
Bundle-SymbolicName: org.cishell.reference.gui.menumanager;singleton:=true
-Bundle-Version: 0.6.0
+Bundle-Version: 1.0.0
Bundle-Activator: org.cishell.reference.gui.menumanager.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
Eclipse-LazyStart: true
-Import-Package: org.cishell.app.service.datamanager,
- org.cishell.app.service.scheduler,
- org.cishell.framework,
- org.cishell.framework.algorithm,
- org.cishell.framework.data,
+Import-Package: org.cishell.app.service.datamanager;version="1.0.0",
+ org.cishell.app.service.scheduler;version="1.0.0",
+ 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.reference.gui.workspace,
- org.cishell.service.conversion,
- org.cishell.service.guibuilder,
+ org.cishell.service.conversion;version="1.0.0",
+ org.cishell.service.guibuilder;version="1.0.0",
org.osgi.service.log;version="1.3.0",
org.osgi.service.metatype;version="1.1.0"
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java 2008-03-25 15:25:26 UTC (rev 696)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java 2008-03-25 15:33:54 UTC (rev 697)
@@ -29,11 +29,6 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.log.LogService;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
public class AlgorithmAction extends Action implements AlgorithmProperty, DataManagerListener {
@@ -113,7 +108,7 @@
//adjust to log the whole acknowledgement in one block
LogService logger = (LogService) ciContext.getService(LogService.class.getName());
StringBuffer acknowledgement = new StringBuffer();
- String label = (String)ref.getProperty("label");
+ String label = (String)ref.getProperty(LABEL);
if (label != null){
acknowledgement.append("..........\n"+
label+" was selected.\n");
@@ -121,22 +116,22 @@
String authors = (String)ref.getProperty("authors");
if (authors != null)
acknowledgement.append("Author(s): "+authors+"\n");
- String implementers = (String)ref.getProperty("implementers");
+ String implementers = (String)ref.getProperty(IMPLEMENTERS);
if (implementers != null)
acknowledgement.append("Implementer(s): "+implementers+"\n");
- String integrators = (String)ref.getProperty("integrators");
+ String integrators = (String)ref.getProperty(INTEGRATORS);
if (integrators != null)
acknowledgement.append("Integrator(s): "+integrators+"\n");
- String reference = (String)ref.getProperty("reference");
- String reference_url = (String)ref.getProperty("reference_url");
+ String reference = (String)ref.getProperty(REFERENCE);
+ String reference_url = (String)ref.getProperty(REFERENCE_URL);
if (reference != null && reference_url != null )
acknowledgement.append("Reference: "+reference+
" ("+reference_url+")\n");
else if (reference != null && reference_url == null )
acknowledgement.append("Reference: "+reference+"\n");
- String docu = (String)ref.getProperty("docu");
+ String docu = (String)ref.getProperty(DOCUMENTATION_URL);
if (docu != null)
- acknowledgement.append("Docu: "+docu+"\n");
+ acknowledgement.append("Documentation: "+docu+"\n");
if(acknowledgement.length()>1)
logger.log(LogService.LOG_INFO, acknowledgement.toString());
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2008-03-25 15:25:26 UTC (rev 696)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2008-03-25 15:33:54 UTC (rev 697)
@@ -110,7 +110,9 @@
}
}
- this.provider = factory.createParameters(data);
+ //FIXME:
+ //this.provider = factory.createParameters(data);
+ this.provider = null;
String pid = (String)ref.getProperty(Constants.SERVICE_PID);
this.parameters = new Hashtable();
@@ -218,12 +220,12 @@
&& originalData.length == data.length) {
for (int i=0; i < outData.length; i++) {
if (outData[i] != null) {
- Object parent = outData[i].getMetaData().get(DataProperty.PARENT);
+ Object parent = outData[i].getMetadata().get(DataProperty.PARENT);
if (parent != null) {
for (int j=0; j < data.length; i++) {
if (parent == data[j]) {
- outData[i].getMetaData().put(DataProperty.PARENT,
+ outData[i].getMetadata().put(DataProperty.PARENT,
originalData[j]);
break;
}
@@ -243,8 +245,8 @@
for (int i=0; i < outData.length; i++) {
//if they don't have a parent set already then we set one
if (outData[i] != null &&
- outData[i].getMetaData().get(DataProperty.PARENT) == null) {
- outData[i].getMetaData().put(DataProperty.PARENT, originalData[0]);
+ outData[i].getMetadata().get(DataProperty.PARENT) == null) {
+ outData[i].getMetadata().put(DataProperty.PARENT, originalData[0]);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2008-03-25 15:27:06
|
Revision: 696
http://cishell.svn.sourceforge.net/cishell/?rev=696&view=rev
Author: huangb
Date: 2008-03-25 08:25:26 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
update bundle-version to 1.0.0
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.log/META-INF/MANIFEST.MF
Modified: trunk/clients/gui/org.cishell.reference.gui.log/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.log/META-INF/MANIFEST.MF 2008-03-25 15:18:21 UTC (rev 695)
+++ trunk/clients/gui/org.cishell.reference.gui.log/META-INF/MANIFEST.MF 2008-03-25 15:25:26 UTC (rev 696)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Log GUI Plug-in
Bundle-SymbolicName: org.cishell.reference.gui.log;singleton:=true
-Bundle-Version: 0.6.0
+Bundle-Version: 1.0.0
Bundle-Activator: org.cishell.reference.gui.log.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 15:19:17
|
Revision: 695
http://cishell.svn.sourceforge.net/cishell/?rev=695&view=rev
Author: bh2
Date: 2008-03-25 08:18:21 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
fixing plugin put in a stupid location
Removed Paths:
-------------
trunk/templates/org.cishell.templates.wizards.killme/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 15:18:08
|
Revision: 694
http://cishell.svn.sourceforge.net/cishell/?rev=694&view=rev
Author: bh2
Date: 2008-03-25 08:16:30 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
fixing plugin put in a stupid location
Added Paths:
-----------
trunk/templates/org.cishell.templates.wizards/
Removed Paths:
-------------
trunk/templates/org.cishell.templates.wizards.killme/org.cishell.templates.wizards/
Copied: trunk/templates/org.cishell.templates.wizards (from rev 693, trunk/templates/org.cishell.templates.wizards.killme/org.cishell.templates.wizards)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 15:15:21
|
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.
|
|
From: <bh...@us...> - 2008-03-25 15:14:32
|
Revision: 692
http://cishell.svn.sourceforge.net/cishell/?rev=692&view=rev
Author: bh2
Date: 2008-03-25 08:13:32 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
fixing plugin put in a stupid location
Added Paths:
-----------
trunk/templates/org.cishell.templates.wizards.killme/
Removed Paths:
-------------
trunk/templates/org.cishell.templates.wizards/
Copied: trunk/templates/org.cishell.templates.wizards.killme (from rev 691, trunk/templates/org.cishell.templates.wizards)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 15:13:32
|
Revision: 691
http://cishell.svn.sourceforge.net/cishell/?rev=691&view=rev
Author: bh2
Date: 2008-03-25 08:11:50 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
updated ant task to have an ant jar in its project so we don't have to worry about it anymore
Modified Paths:
--------------
trunk/templates/org.cishell.templates.tasks/.classpath
Added Paths:
-----------
trunk/templates/org.cishell.templates.tasks/lib/
trunk/templates/org.cishell.templates.tasks/lib/ant.jar
Modified: trunk/templates/org.cishell.templates.tasks/.classpath
===================================================================
--- trunk/templates/org.cishell.templates.tasks/.classpath 2008-03-25 14:57:57 UTC (rev 690)
+++ trunk/templates/org.cishell.templates.tasks/.classpath 2008-03-25 15:11:50 UTC (rev 691)
@@ -2,10 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="/home/bherr/bin/eclipse/plugins/org.apache.ant_1.6.5/lib/ant.jar">
- <attributes>
- <attribute value="http://www.cs.bris.ac.uk/Teaching/Resources/General/ant/docs/manual/api/" name="javadoc_location"/>
- </attributes>
- </classpathentry>
+ <classpathentry kind="lib" path="lib/ant.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Added: trunk/templates/org.cishell.templates.tasks/lib/ant.jar
===================================================================
(Binary files differ)
Property changes on: trunk/templates/org.cishell.templates.tasks/lib/ant.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fu...@us...> - 2008-03-25 14:58:23
|
Revision: 690
http://cishell.svn.sourceforge.net/cishell/?rev=690&view=rev
Author: fugu13
Date: 2008-03-25 07:57:57 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
Verified no need to update for changes in algorithm and such. Updated version numbers.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/META-INF/MANIFEST.MF
trunk/clients/gui/org.cishell.reference.gui.scheduler/META-INF/MANIFEST.MF
Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/META-INF/MANIFEST.MF 2008-03-25 14:53:56 UTC (rev 689)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/META-INF/MANIFEST.MF 2008-03-25 14:57:57 UTC (rev 690)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: GUI Builder Reference Implementation Using SWT
Bundle-SymbolicName: org.cishell.reference.gui.guibuilder.swt
-Bundle-Version: 0.6.0
+Bundle-Version: 1.0.0
Bundle-Localization: plugin
Import-Package: org.cishell.framework,
org.cishell.service.guibuilder,
Modified: trunk/clients/gui/org.cishell.reference.gui.scheduler/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.scheduler/META-INF/MANIFEST.MF 2008-03-25 14:53:56 UTC (rev 689)
+++ trunk/clients/gui/org.cishell.reference.gui.scheduler/META-INF/MANIFEST.MF 2008-03-25 14:57:57 UTC (rev 690)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Scheduler GUI Plug-in
Bundle-SymbolicName: org.cishell.reference.gui.scheduler;singleton:=true
-Bundle-Version: 0.4.0
+Bundle-Version: 1.0.0
Bundle-Activator: org.cishell.reference.gui.scheduler.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 14:54:01
|
Revision: 689
http://cishell.svn.sourceforge.net/cishell/?rev=689&view=rev
Author: bh2
Date: 2008-03-25 07:53:56 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
bumped to version 1.0
Modified Paths:
--------------
trunk/core/org.cishell.reference/META-INF/MANIFEST.MF
trunk/core/org.cishell.reference.services/META-INF/MANIFEST.MF
trunk/core/org.cishell.service.autostart/META-INF/MANIFEST.MF
Modified: trunk/core/org.cishell.reference/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/org.cishell.reference/META-INF/MANIFEST.MF 2008-03-25 14:48:17 UTC (rev 688)
+++ trunk/core/org.cishell.reference/META-INF/MANIFEST.MF 2008-03-25 14:53:56 UTC (rev 689)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CIShell Reference Service Implementations
Bundle-SymbolicName: org.cishell.reference
-Bundle-Version: 0.4.0
+Bundle-Version: 1.0.0
Bundle-Localization: plugin
Import-Package: org.cishell.app.service.datamanager;version="1.0.0",
org.cishell.app.service.scheduler;version="1.0.0",
Modified: trunk/core/org.cishell.reference.services/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/org.cishell.reference.services/META-INF/MANIFEST.MF 2008-03-25 14:48:17 UTC (rev 688)
+++ trunk/core/org.cishell.reference.services/META-INF/MANIFEST.MF 2008-03-25 14:53:56 UTC (rev 689)
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: Reference Services Starter
Bundle-SymbolicName: org.cishell.reference.services
-Bundle-Version: 0.3.0
+Bundle-Version: 1.0.0
Bundle-Activator: org.cishell.reference.services.Activator
Bundle-Localization: plugin
X-AutoStart: true
-Import-Package: org.cishell.app.service.datamanager,
- org.cishell.app.service.scheduler,
- org.cishell.framework,
+Import-Package: org.cishell.app.service.datamanager;version="1.0.0",
+ org.cishell.app.service.scheduler;version="1.0.0",
+ org.cishell.framework;version="1.0.0",
org.cishell.reference.app.service.datamanager,
org.cishell.reference.app.service.scheduler,
org.cishell.reference.service.conversion,
- org.cishell.service.conversion,
+ org.cishell.service.conversion;version="1.0.0",
org.osgi.framework;version="1.3.0"
Modified: trunk/core/org.cishell.service.autostart/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/org.cishell.service.autostart/META-INF/MANIFEST.MF 2008-03-25 14:48:17 UTC (rev 688)
+++ trunk/core/org.cishell.service.autostart/META-INF/MANIFEST.MF 2008-03-25 14:53:56 UTC (rev 689)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CIShell Bundler Autostarter
Bundle-SymbolicName: org.cishell.service.autostart
-Bundle-Version: 0.3.0
+Bundle-Version: 1.0.0
Bundle-Activator: org.cishell.service.autostart.Activator
Bundle-Localization: plugin
Import-Package: org.osgi.framework;version="1.3.0"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 14:48:29
|
Revision: 688
http://cishell.svn.sourceforge.net/cishell/?rev=688&view=rev
Author: bh2
Date: 2008-03-25 07:48:17 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
additional 1.0 changes
Modified Paths:
--------------
trunk/core/org.cishell.reference/META-INF/MANIFEST.MF
trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java
Modified: trunk/core/org.cishell.reference/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/org.cishell.reference/META-INF/MANIFEST.MF 2008-03-25 14:37:39 UTC (rev 687)
+++ trunk/core/org.cishell.reference/META-INF/MANIFEST.MF 2008-03-25 14:48:17 UTC (rev 688)
@@ -4,13 +4,13 @@
Bundle-SymbolicName: org.cishell.reference
Bundle-Version: 0.4.0
Bundle-Localization: plugin
-Import-Package: org.cishell.app.service.datamanager,
- org.cishell.app.service.scheduler,
- org.cishell.framework,
- org.cishell.framework.algorithm,
- org.cishell.framework.data,
- org.cishell.service.conversion,
- org.cishell.service.guibuilder,
+Import-Package: org.cishell.app.service.datamanager;version="1.0.0",
+ org.cishell.app.service.scheduler;version="1.0.0",
+ 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.conversion;version="1.0.0",
+ org.cishell.service.guibuilder;version="1.0.0",
org.osgi.framework,
org.osgi.service.log,
org.osgi.service.metatype;version="1.1.0",
Modified: trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java
===================================================================
--- trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java 2008-03-25 14:37:39 UTC (rev 687)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java 2008-03-25 14:48:17 UTC (rev 688)
@@ -53,7 +53,8 @@
/**
* Builds converter chains from one data type to another
*
- * @author Bruce Herr, Ben Markines
+ * @author Bruce Herr
+ * @author Ben Markines
*
*/
public class DataConversionServiceImpl implements DataConversionService, AlgorithmProperty, ServiceListener {
@@ -292,14 +293,6 @@
}
return null;
}
-
- /**
- * @see org.cishell.service.conversion.DataConversionService#findConverters(java.lang.String, java.lang.String, int, java.lang.String)
- */
- public Converter[] findConverters(String inFormat, String outFormat,
- int maxHops, String maxComplexity) {
- return findConverters(inFormat, outFormat);
- }
/**
* Builds the converter chains using data as the source
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 14:37:53
|
Revision: 687
http://cishell.svn.sourceforge.net/cishell/?rev=687&view=rev
Author: bh2
Date: 2008-03-25 07:37:39 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
initial fix for the reference bundle to update to cishell 1.0
Modified Paths:
--------------
trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/datamanager/DataManagerServiceImpl.java
trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java
trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java
Modified: trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/datamanager/DataManagerServiceImpl.java
===================================================================
--- trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/datamanager/DataManagerServiceImpl.java 2008-03-25 14:34:48 UTC (rev 686)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/datamanager/DataManagerServiceImpl.java 2008-03-25 14:37:39 UTC (rev 687)
@@ -53,12 +53,12 @@
if(model == null){
return;
}
- String label = (String)model.getMetaData().get(DataProperty.LABEL);
- String type = (String)model.getMetaData().get(DataProperty.TYPE);
+ String label = (String)model.getMetadata().get(DataProperty.LABEL);
+ String type = (String)model.getMetadata().get(DataProperty.TYPE);
if(type == null){
type = DataProperty.OTHER_TYPE;
- model.getMetaData().put(DataProperty.TYPE, type);
+ model.getMetadata().put(DataProperty.TYPE, type);
}
//generate label if needed
@@ -98,9 +98,9 @@
private void addModel(Data model, String label) {
label = findUniqueLabel(label);
- model.getMetaData().put(DataProperty.LABEL, label);
+ model.getMetadata().put(DataProperty.LABEL, label);
//set the model to be unsaved initially
- model.getMetaData().put(DataProperty.MODIFIED, new Boolean(true));
+ model.getMetadata().put(DataProperty.MODIFIED, new Boolean(true));
modelToLabelMap.put(model, label);
labelToModelMap.put(label, model);
Modified: trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java
===================================================================
--- trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java 2008-03-25 14:34:48 UTC (rev 686)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java 2008-03-25 14:37:39 UTC (rev 687)
@@ -19,10 +19,12 @@
import org.cishell.framework.CIShellContext;
import org.cishell.framework.algorithm.Algorithm;
+import org.cishell.framework.algorithm.AlgorithmExecutionException;
import org.cishell.framework.algorithm.AlgorithmFactory;
import org.cishell.framework.algorithm.AlgorithmProperty;
import org.cishell.framework.data.BasicData;
import org.cishell.framework.data.Data;
+import org.cishell.service.conversion.ConversionException;
import org.cishell.service.conversion.Converter;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -63,13 +65,17 @@
/**
* @see org.cishell.service.conversion.Converter#convert(org.cishell.framework.data.Data)
*/
- public Data convert(Data inDM) {
+ public Data convert(Data inDM) throws ConversionException {
Data[] dm = new Data[]{inDM};
AlgorithmFactory factory = getAlgorithmFactory();
Algorithm alg = factory.createAlgorithm(dm, new Hashtable(), ciContext);
- dm = alg.execute();
+ try {
+ dm = alg.execute();
+ } catch (AlgorithmExecutionException e1) {
+ throw new ConversionException(e1);
+ }
Object outData = null;
if (dm != null && dm.length > 0) {
@@ -77,7 +83,7 @@
}
if (outData != null) {
- Dictionary props = inDM.getMetaData();
+ Dictionary props = inDM.getMetadata();
Dictionary newProps = new Hashtable();
for (Enumeration e=props.keys(); e.hasMoreElements();) {
@@ -165,7 +171,7 @@
this.context = context;
}
- public Data[] execute() {
+ public Data[] execute() throws AlgorithmExecutionException {
Data[] dm = inDM;
for (int i=0; i < refs.length; i++) {
AlgorithmFactory factory = (AlgorithmFactory)bContext.getService(refs[i]);
@@ -175,7 +181,7 @@
dm = alg.execute();
} else {
- throw new RuntimeException("Missing subconverter: "
+ throw new AlgorithmExecutionException("Missing subconverter: "
+ refs[i].getProperty(Constants.SERVICE_PID));
}
}
Modified: trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java
===================================================================
--- trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java 2008-03-25 14:34:48 UTC (rev 686)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java 2008-03-25 14:37:39 UTC (rev 687)
@@ -30,6 +30,7 @@
import org.cishell.framework.algorithm.AlgorithmFactory;
import org.cishell.framework.algorithm.AlgorithmProperty;
import org.cishell.framework.data.Data;
+import org.cishell.service.conversion.ConversionException;
import org.cishell.service.conversion.Converter;
import org.cishell.service.conversion.DataConversionService;
import org.osgi.framework.BundleContext;
@@ -370,7 +371,7 @@
* @return The final data type
* @see org.cishell.service.conversion.DataConversionService#convert(org.cishell.framework.data.Data, java.lang.String)
*/
- public Data convert(Data inDM, String outFormat) {
+ public Data convert(Data inDM, String outFormat) throws ConversionException {
String inFormat = inDM.getFormat();
if (inFormat != null && inFormat.equals(outFormat)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 14:35:00
|
Revision: 686
http://cishell.svn.sourceforge.net/cishell/?rev=686&view=rev
Author: bh2
Date: 2008-03-25 07:34:48 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
added an additional constructor for exception classes
Modified Paths:
--------------
trunk/core/org.cishell.framework/src/org/cishell/framework/algorithm/AlgorithmExecutionException.java
trunk/core/org.cishell.framework/src/org/cishell/service/conversion/ConversionException.java
Modified: trunk/core/org.cishell.framework/src/org/cishell/framework/algorithm/AlgorithmExecutionException.java
===================================================================
--- trunk/core/org.cishell.framework/src/org/cishell/framework/algorithm/AlgorithmExecutionException.java 2008-03-25 14:19:31 UTC (rev 685)
+++ trunk/core/org.cishell.framework/src/org/cishell/framework/algorithm/AlgorithmExecutionException.java 2008-03-25 14:34:48 UTC (rev 686)
@@ -22,7 +22,11 @@
public class AlgorithmExecutionException extends Exception {
private static final long serialVersionUID = 9017277008277139930L;
- public AlgorithmExecutionException(Exception exception) {
+ public AlgorithmExecutionException(String message, Throwable exception) {
+ super(message, exception);
+ }
+
+ public AlgorithmExecutionException(Throwable exception) {
super(exception);
}
Modified: trunk/core/org.cishell.framework/src/org/cishell/service/conversion/ConversionException.java
===================================================================
--- trunk/core/org.cishell.framework/src/org/cishell/service/conversion/ConversionException.java 2008-03-25 14:19:31 UTC (rev 685)
+++ trunk/core/org.cishell.framework/src/org/cishell/service/conversion/ConversionException.java 2008-03-25 14:34:48 UTC (rev 686)
@@ -23,7 +23,11 @@
public class ConversionException extends Exception {
private static final long serialVersionUID = 1749134893481511313L;
- public ConversionException(Exception exception) {
+ public ConversionException(String message, Throwable exception) {
+ super(message, exception);
+ }
+
+ public ConversionException(Throwable exception) {
super(exception);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 14:19:52
|
Revision: 685
http://cishell.svn.sourceforge.net/cishell/?rev=685&view=rev
Author: bh2
Date: 2008-03-25 07:19:31 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
deleted the spec_update branch
Removed Paths:
-------------
branches/spec_update/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 14:18:28
|
Revision: 684
http://cishell.svn.sourceforge.net/cishell/?rev=684&view=rev
Author: bh2
Date: 2008-03-25 07:18:04 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
moved 1.0 wizard bundle to trunk
Added Paths:
-----------
trunk/templates/org.cishell.templates.wizards/
Removed Paths:
-------------
branches/spec_update/org.cishell.templates.wizards/
Copied: trunk/templates/org.cishell.templates.wizards (from rev 683, branches/spec_update/org.cishell.templates.wizards)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 14:17:32
|
Revision: 683
http://cishell.svn.sourceforge.net/cishell/?rev=683&view=rev
Author: bh2
Date: 2008-03-25 07:17:27 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
removing old wizards to be replaced by 1.0 wizard bundle
Removed Paths:
-------------
trunk/templates/org.cishell.templates.wizards/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 14:16:40
|
Revision: 682
http://cishell.svn.sourceforge.net/cishell/?rev=682&view=rev
Author: bh2
Date: 2008-03-25 07:16:38 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
moved 1.0 framework bundle to trunk
Added Paths:
-----------
trunk/core/org.cishell.framework/
Removed Paths:
-------------
branches/spec_update/org.cishell.framework/
Copied: trunk/core/org.cishell.framework (from rev 681, branches/spec_update/org.cishell.framework)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 14:13:41
|
Revision: 681
http://cishell.svn.sourceforge.net/cishell/?rev=681&view=rev
Author: bh2
Date: 2008-03-25 07:13:11 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
removing old framework to be replaced by 1.0 framework bundle
Removed Paths:
-------------
trunk/core/org.cishell.framework/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2008-03-25 14:10:07
|
Revision: 680
http://cishell.svn.sourceforge.net/cishell/?rev=680&view=rev
Author: huangb
Date: 2008-03-25 07:10:02 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
duplicated, remove
Removed Paths:
-------------
tags/pre-1.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2008-03-25 14:09:05
|
Revision: 679
http://cishell.svn.sourceforge.net/cishell/?rev=679&view=rev
Author: bh2
Date: 2008-03-25 07:09:00 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
removing unmaintained cishell-ivc compatibility plugins
Removed Paths:
-------------
trunk/clients/old-cishell-compatibility/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2008-03-25 14:07:24
|
Revision: 678
http://cishell.svn.sourceforge.net/cishell/?rev=678&view=rev
Author: huangb
Date: 2008-03-25 07:07:15 -0700 (Tue, 25 Mar 2008)
Log Message:
-----------
tag trunk before update all code to comply with spec 1.0
Added Paths:
-----------
tags/pre-1.0/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
