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
|
|
From: <bh...@us...> - 2006-10-19 17:47:20
|
Revision: 302
http://svn.sourceforge.net/cishell/?rev=302&view=rev
Author: bh2
Date: 2006-10-19 10:47:11 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
fixed File/View to work on Linux correctly
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java 2006-10-19 17:46:36 UTC (rev 301)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/view/FileView.java 2006-10-19 17:47:11 UTC (rev 302)
@@ -7,20 +7,18 @@
import java.nio.channels.FileChannel;
import java.util.Dictionary;
-import org.osgi.service.log.LogService;
-
-import org.eclipse.swt.program.Program;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.IWorkbenchWindow;
-
import org.cishell.framework.CIShellContext;
import org.cishell.framework.algorithm.Algorithm;
import org.cishell.framework.data.Data;
+import org.cishell.service.conversion.Converter;
import org.cishell.service.conversion.DataConversionService;
import org.cishell.service.guibuilder.GUIBuilderService;
-import org.cishell.service.conversion.Converter;
+import org.eclipse.swt.program.Program;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.osgi.service.log.LogService;
/*
* @author Weixia(Bonnie) Huang (hu...@in...)
@@ -32,8 +30,9 @@
DataConversionService conversionManager;
static GUIBuilderService guiBuilder;
LogService logger;
+ Program program;
+ File tempFile;
-
public FileView(Data[] data, Dictionary parameters, CIShellContext context) {
this.data = data;
this.parameters = parameters;
@@ -67,12 +66,11 @@
public Data[] execute() {
boolean lastSaveSuccessful = false;
String format;
- File tempFile;
+
Display display;
IWorkbenchWindow[] windows;
final Shell parentShell;
-
windows = PlatformUI.getWorkbench().getWorkbenchWindows();
if (windows.length == 0){
return null;
@@ -107,19 +105,26 @@
}
}
}
- //display the file content
- Program program = Program.findProgram("txt");
+
+
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ program = Program.findProgram("txt");
+ }});
+
if (program == null) {
guiBuilder.showError("No Text Viewer",
"No valid text viewer for the .txt file. " +
"The file is located at: "+tempFile.getAbsolutePath(),
"Unable to open default text viewer. File is located at: "+
tempFile.getAbsolutePath());
- return null;
}
else {
if (lastSaveSuccessful == true) {
- program.execute(tempFile.getAbsolutePath());
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ program.execute(tempFile.getAbsolutePath());
+ }});
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-19 17:46:55
|
Revision: 301
http://svn.sourceforge.net/cishell/?rev=301&view=rev
Author: bh2
Date: 2006-10-19 10:46:36 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
fixed File/View to work on Linux correctly
Modified Paths:
--------------
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/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 2006-10-19 16:21:36 UTC (rev 300)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2006-10-19 17:46:36 UTC (rev 301)
@@ -60,6 +60,9 @@
AlgorithmFactory factory = (AlgorithmFactory) bContext.getService(ref);
Algorithm alg = factory.createAlgorithm(data, parameters, ciContext);
+
+ //TODO: Print input parameters/metadata here using log service
+
Data[] outData = alg.execute();
if (outData != null) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bea...@us...> - 2006-10-19 16:21:47
|
Revision: 300
http://svn.sourceforge.net/cishell/?rev=300&view=rev
Author: bearsfan
Date: 2006-10-19 09:21:36 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
Removed duplicate converter chains and documented the conversion service implementation.
Modified Paths:
--------------
trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java
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 2006-10-17 21:35:00 UTC (rev 299)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java 2006-10-19 16:21:36 UTC (rev 300)
@@ -49,6 +49,12 @@
import edu.uci.ics.jung.io.GraphMLFile;
import edu.uci.ics.jung.utils.UserDataContainer;
+/**
+ * Builds converter chains from one data type to another
+ *
+ * @author Bruce Herr, Ben Markines
+ *
+ */
public class DataConversionServiceImpl implements DataConversionService, AlgorithmProperty, ServiceListener {
public final static String SERVICE_LIST = "SERVICE_LIST";
@@ -57,6 +63,12 @@
private Map dataTypeToVertex;
private Graph graph;
+ /**
+ * Set up to listen for service requests and initial set up of the graph
+ *
+ * @param bContext Current bundle context
+ * @param ciContext Current CIShell context
+ */
public DataConversionServiceImpl(BundleContext bContext, CIShellContext ciContext) {
this.bContext = bContext;
this.ciContext = ciContext;
@@ -77,7 +89,7 @@
}
/**
- * Assemble the directed graph of converters
+ * Assemble the directed graph of converters. Currently unweighted
*
*/
private void assembleGraph() {
@@ -110,9 +122,12 @@
throw new RuntimeException(e);
}
}
-
+
/**
- * @see org.cishell.service.conversion.DataConversionService#findConverters(java.lang.String, java.lang.String)
+ * Get the converter chains for incoming and outgoing format
+ *
+ * @param inFormat The format to convert from
+ * @param outFormat The format to convert to
*/
public Converter[] findConverters(String inFormat, String outFormat) {
//saveGraph();
@@ -133,6 +148,14 @@
return new Converter[0];
}
+ /**
+ * If the final format is of type file-ext, then append the final converter to the
+ * converter list
+ *
+ * @param converters Current converter chain
+ * @param outFormat Final data type
+ * @return The edited converter chain
+ */
private Converter[] addFinalStepConversions(Converter[] converters, String outFormat) {
Collection newConverters = new HashSet();
@@ -177,6 +200,13 @@
return (Converter[]) newConverters.toArray(new Converter[0]);
}
+ /**
+ * Build the converter chains
+ * @param inFormat The original data type
+ * @param outFormat The target data type
+ * @return Converter chains
+ * @see org.cishell.service.conversion.DataConversionService#findConverters(java.lang.String, java.lang.String)
+ */
private Converter[] getConverters(String inFormat, String outFormat) {
String inFilter = "(&(" + ALGORITHM_TYPE + "=" + TYPE_CONVERTER + ")"
+ "("+IN_DATA+"="+inFormat+") " + "("+OUT_DATA+"=*)" +
@@ -233,6 +263,12 @@
return (Converter[]) converterList.toArray(new Converter[0]);
}
+ /**
+ * Get the shortest converter path. This returns a single converter path
+ * @param inType The source data type
+ * @param outType The target data type
+ * @return Single converter path
+ */
private Converter getConverter(String inType, String outType) {
Vertex srcVertex = (Vertex)dataTypeToVertex.get(inType);
Vertex tgtVertex = (Vertex)dataTypeToVertex.get(outType);
@@ -266,6 +302,10 @@
}
/**
+ * Builds the converter chains using data as the source
+ * @param data The source data to convert from
+ * @param outFormat the final data type
+ * @return Converter chains
* @see org.cishell.service.conversion.DataConversionService#findConverters(org.cishell.framework.data.Data, java.lang.String)
*/
public Converter[] findConverters(Data data, String outFormat) {
@@ -291,13 +331,40 @@
while (iter.hasNext()) {
Class c = (Class) iter.next();
converters = findConverters(c.getName(), outFormat);
- set.addAll(new HashSet(Arrays.asList(converters)));
+ //this is a bit of a hack to remove the duplicate converters
+ addUniqueConverters(set, converters);
+ //set.addAll(new HashSet(Arrays.asList(converters)));
}
}
return (Converter[]) set.toArray(new Converter[0]);
}
+ /**
+ * Only add the unique converters to the 'Converter set'
+ * @param set The set of unique converters
+ * @param converters List of potential converters
+ */
+ private void addUniqueConverters(Set set, Converter[] converters) {
+ for (int i = 0; i < converters.length; ++i) {
+ boolean uniqueConverter = true;
+ for (Iterator iter = set.iterator(); iter.hasNext();) {
+ if (iter.next().equals(converters[i])) {
+ uniqueConverter = false;
+ break;
+ }
+ }
+ if (uniqueConverter) {
+ set.add(converters[i]);
+ }
+ }
+ }
+
+ /**
+ * Get all the classes implemented and extended
+ * @param clazz The class to query
+ * @return Interfaces and base classes
+ */
protected Collection getClassesFor(Class clazz) {
Set classes = new HashSet();
@@ -321,6 +388,10 @@
}
/**
+ * Convert the Data to a format
+ * @param inDM Data type to convert
+ * @param outFormat The data type to convert
+ * @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) {
@@ -338,7 +409,10 @@
return inDM;
}
-
+ /**
+ * Change service reference in the graph
+ * @param event The service that changed
+ */
public void serviceChanged(ServiceEvent event) {
ServiceReference inServiceRef = event.getServiceReference();
@@ -357,6 +431,12 @@
}
}
+ /**
+ * Remove a service reference in the graph
+ * @param srcDataType The source data type of the serviceReference to remove
+ * @param tgtDataType The target data type of the serviceReference to remove
+ * @param serviceReference The serviceReference to remove
+ */
private void removeServiceReference(String srcDataType, String tgtDataType, ServiceReference serviceReference) {
if (srcDataType != null && tgtDataType != null) {
Vertex srcVertex = (Vertex) dataTypeToVertex.get(srcDataType);
@@ -388,6 +468,12 @@
}
}
+ /**
+ * Add service reference to the graph
+ * @param srcDataType The source data type
+ * @param tgtDataType The target data type
+ * @param serviceReference The service reference to add
+ */
private void addServiceReference(String srcDataType, String tgtDataType, ServiceReference serviceReference) {
if (srcDataType != null && srcDataType.length() > 0
&& tgtDataType != null && tgtDataType.length() > 0) {
@@ -412,6 +498,12 @@
}
}
+ /**
+ * Get the vertex in the graph given a data type. Creates a new vertex
+ * if one does not exist
+ * @param dataType Datatype representing the node
+ * @return The vertex
+ */
private Vertex getVertex(String dataType) {
Vertex vertex = (SparseVertex)dataTypeToVertex.get(dataType);
if (vertex== null) {
@@ -424,6 +516,10 @@
return vertex;
}
+ /**
+ * Save the current converter graph to the user's home directory
+ *
+ */
private void saveGraph() {
GraphMLFile writer = new GraphMLFile();
Graph g = (Graph)graph.copy();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-10-17 21:35:13
|
Revision: 299
http://svn.sourceforge.net/cishell/?rev=299&view=rev
Author: huangb
Date: 2006-10-17 14:35:00 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
Bug Fix: Check process exitValue. If the static executable algorithm crashes in the middle of the
runtime, display the error using the guibuilder
Modified Paths:
--------------
trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java
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 2006-10-17 21:31:54 UTC (rev 298)
+++ trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java 2006-10-17 21:35:00 UTC (rev 299)
@@ -35,6 +35,7 @@
import org.cishell.framework.data.BasicData;
import org.cishell.framework.data.Data;
import org.cishell.framework.data.DataProperty;
+import org.cishell.service.guibuilder.GUIBuilderService;
import org.cishell.templates.Activator;
import org.osgi.framework.BundleContext;
import org.osgi.service.log.LogService;
@@ -45,10 +46,12 @@
*/
public class StaticExecutableRunner implements Algorithm {
protected final String tempDir;
+ protected final GUIBuilderService guiBuilder;
protected final Data[] data;
protected Dictionary parameters;
protected Properties props;
protected CIShellContext ciContext;
+
public StaticExecutableRunner(BundleContext bContext, CIShellContext ciContext, Properties props, Dictionary parameters, Data[] data) throws IOException {
this.ciContext = ciContext;
@@ -56,6 +59,9 @@
this.parameters = parameters;
this.data = data;
+ guiBuilder = (GUIBuilderService)ciContext.getService(GUIBuilderService.class.getName());
+
+
if (data == null) data = new Data[0];
if (parameters == null) parameters = new Hashtable();
@@ -147,6 +153,14 @@
logStream(LogService.LOG_ERROR, process.getErrorStream());
process.waitFor();
+ //successfully ran?
+ if (process.exitValue() != 0) {
+ //display the error message using gui builder
+ guiBuilder.showError("Algorithm Could Not Finish Execution", "Sorry, the algorithm could not finish execution.",
+ "Please check the console window for the error log messages and report the bug.\n"
+ +"Thank you.");
+ }
+
//get the outputted files
String[] afterFiles = dir.list();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-10-17 21:31:59
|
Revision: 298
http://svn.sourceforge.net/cishell/?rev=298&view=rev
Author: huangb
Date: 2006-10-17 14:31:54 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
add org.cishell.service.guibuilder to the Import-Package
Modified Paths:
--------------
trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF
Modified: trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF
===================================================================
--- trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF 2006-10-17 21:30:25 UTC (rev 297)
+++ trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF 2006-10-17 21:31:54 UTC (rev 298)
@@ -8,6 +8,7 @@
Import-Package: org.cishell.framework,
org.cishell.framework.algorithm,
org.cishell.framework.data,
+ org.cishell.service.guibuilder,
org.osgi.framework;version="1.3.0",
org.osgi.service.component;version="1.0.0",
org.osgi.service.log;version="1.3.0",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-10-17 21:30:34
|
Revision: 297
http://svn.sourceforge.net/cishell/?rev=297&view=rev
Author: huangb
Date: 2006-10-17 14:30:25 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
In addData(Data model) method, first check if the input model is null or not.
If it is null, retun immediately.
Modified Paths:
--------------
trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/datamanager/DataManagerServiceImpl.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 2006-10-17 19:26:48 UTC (rev 296)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/app/service/datamanager/DataManagerServiceImpl.java 2006-10-17 21:30:25 UTC (rev 297)
@@ -50,6 +50,9 @@
* @see edu.iu.iv.core.ModelManager#addData(java.lang.Object)
*/
public void addData(Data model) {
+ if(model == null){
+ return;
+ }
String label = (String)model.getMetaData().get(DataProperty.LABEL);
String type = (String)model.getMetaData().get(DataProperty.TYPE);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bea...@us...> - 2006-10-17 19:26:52
|
Revision: 296
http://svn.sourceforge.net/cishell/?rev=296&view=rev
Author: bearsfan
Date: 2006-10-17 12:26:48 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
Added support for viewing and saving from within the DataManager viewer
Modified Paths:
--------------
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/Activator.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 2006-10-17 17:04:38 UTC (rev 295)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/AbstractDataManagerView.java 2006-10-17 19:26:48 UTC (rev 296)
@@ -91,10 +91,12 @@
private Map dataToDataGUIItemMap;
private AlgorithmFactory saveFactory;
+ private AlgorithmFactory viewFactory;
private DiscardListener discardListener;
private SaveListener saveListener;
+ private ViewListener viewListener;
public AbstractDataManagerView(String brandPluginID) {
manager = Activator.getDataManagerService();
@@ -102,8 +104,10 @@
dataToDataGUIItemMap = new HashMap();
if (manager == null) {
- Activator.getLogService().log(LogService.LOG_ERROR,
- "Data Manager Service unavailable!");
+ LogService log = Activator.getLogService();
+ if (log != null) {
+ log.log(LogService.LOG_ERROR, "Data Manager Service unavailable!");
+ }
}
}
@@ -133,15 +137,14 @@
MenuItem saveItem = new MenuItem(menu, SWT.PUSH);
saveItem.setText("Save");
- this.saveFactory = Activator.getSaveService();
- if (this.saveFactory != null) {
- saveListener = new SaveListener();
- saveItem.addListener(SWT.Selection, saveListener);
- }
- else {
- saveItem.setEnabled(false);
- }
+ saveListener = new SaveListener();
+ saveItem.addListener(SWT.Selection, saveListener);
+ MenuItem viewItem = new MenuItem(menu, SWT.PUSH);
+ viewItem.setText("View");
+ viewListener = new ViewListener();
+ viewItem.addListener(SWT.Selection, viewListener);
+
MenuItem renameItem = new MenuItem(menu, SWT.PUSH);
renameItem.setText("Rename");
renameItem.addListener(SWT.Selection, new Listener() {
@@ -185,7 +188,9 @@
public void bundleChanged(BundleEvent event) {
if (event.getType() == BundleEvent.STARTED) {
manager = Activator.getDataManagerService();
- manager.addDataManagerListener(this);
+ if (manager != null) {
+ manager.addDataManagerListener(this);
+ }
}
}
@@ -303,14 +308,38 @@
* their is an available Persister for the given model
*/
private void updateContextMenu(Data model) {
- // reset the enablement of the save context menu appropriately
- // boolean saveEnabled = (model.getData() != null) &&
- // !(IVC.getInstance().getPersistenceRegistry()
- // .getSupportingPersisters(model.getData()).isEmpty());
- boolean saveEnabled = false;
- menu.getItem(0).setEnabled(saveEnabled);
+ saveFactory = enableMenuItemCheck(saveFactory,
+ "org.cishell.reference.gui.persistence.save.Save", model, 0);
+ viewFactory = enableMenuItemCheck(viewFactory,
+ "org.cishell.reference.gui.persistence.view.FileView", model, 1);
}
+
+ private AlgorithmFactory enableMenuItemCheck(
+ AlgorithmFactory algorithmFactory, String service, Data model,
+ int menuNdx) {
+ boolean validSaveFactory = false;
+ if (algorithmFactory == null) {
+ algorithmFactory = Activator.getService(service);
+ if (algorithmFactory != null) {
+ validSaveFactory = true;
+ }
+ } else {
+ validSaveFactory = true;
+ }
+ boolean enabled = false;
+ if (validSaveFactory) {
+ Algorithm algorithm = algorithmFactory.createAlgorithm(
+ new Data[] { model }, new Hashtable(), Activator
+ .getCIShellContext());
+ if (algorithm != null) {
+ enabled = true;
+ }
+ }
+ menu.getItem(menuNdx).setEnabled(enabled);
+ return algorithmFactory;
+ }
+
/*
* Listens for selection in the GUI of data models by selecting their item
* in the tree and updates the ModelManager appropriately
@@ -445,17 +474,30 @@
private class SaveListener implements Listener {
public void handleEvent(Event event) {
- if (AbstractDataManagerView.this.saveFactory != null) {
- TreeItem[] selection = AbstractDataManagerView.this.tree.getSelection();
- Data data = ((DataGUIItem)selection[0].getData()).getModel();
- Algorithm algorithm = AbstractDataManagerView.this.saveFactory.createAlgorithm(new Data[]{data},
- new Hashtable(),
- Activator.getCIShellContext());
+ if (saveFactory != null) {
+ Data data[] = AbstractDataManagerView.this.manager
+ .getSelectedData();
+ Algorithm algorithm = saveFactory
+ .createAlgorithm(data, new Hashtable(), Activator
+ .getCIShellContext());
algorithm.execute();
}
}
}
+ private class ViewListener implements Listener {
+ public void handleEvent(Event event) {
+ if (viewFactory != null) {
+ Data data[] = AbstractDataManagerView.this.manager
+ .getSelectedData();
+ Algorithm algorithm = viewFactory
+ .createAlgorithm(data, new Hashtable(), Activator
+ .getCIShellContext());
+ algorithm.execute();
+ }
+ }
+ }
+
private class DiscardListener implements Listener {
public void handleEvent(Event event) {
TreeItem[] selection = AbstractDataManagerView.this.tree
Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/Activator.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/Activator.java 2006-10-17 17:04:38 UTC (rev 295)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/Activator.java 2006-10-17 19:26:48 UTC (rev 296)
@@ -71,17 +71,23 @@
}
protected static LogService getLogService() {
- LogService log = (LogService) context.getService(
+ ServiceReference serviceReference = context.getServiceReference(DataManagerService.class.getName());
+ LogService log = null;
+
+ if (serviceReference != null) {
+ log = (LogService) context.getService(
context.getServiceReference(LogService.class.getName()));
+ }
return log;
}
- protected static AlgorithmFactory getSaveService() {
+ protected static AlgorithmFactory getService(String service) {
ServiceReference[] refs;
try {
refs = context.getServiceReferences(AlgorithmFactory.class.getName(),
- "(&("+Constants.SERVICE_PID+"=org.cishell.reference.gui.persistence.save.Save))");
+ "(&("+Constants.SERVICE_PID+"="+service+"))");
+ //"(&("+Constants.SERVICE_PID+"=org.cishell.reference.gui.persistence.save.Save))");
if (refs != null && refs.length > 0) {
return (AlgorithmFactory) context.getService(refs[0]);
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-17 17:04:43
|
Revision: 295
http://svn.sourceforge.net/cishell/?rev=295&view=rev
Author: bh2
Date: 2006-10-17 10:04:38 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
small changes made for the 0.2.0 release
Modified Paths:
--------------
trunk/deployment/cishell-installer/cishell.product
trunk/deployment/org.cishell.environment.equinox.feature/feature.xml
Modified: trunk/deployment/cishell-installer/cishell.product
===================================================================
--- trunk/deployment/cishell-installer/cishell.product 2006-10-17 15:43:39 UTC (rev 294)
+++ trunk/deployment/cishell-installer/cishell.product 2006-10-17 17:04:38 UTC (rev 295)
@@ -40,11 +40,11 @@
</plugins>
<features>
- <feature id="org.cishell.algorithm.examples.feature" version="0.1.0.qualifier"/>
+ <feature id="org.cishell.algorithm.examples.feature" version="0.2.0.qualifier"/>
<feature id="org.cishell.environment.equinox.feature" version="0.1.0"/>
<feature id="org.cishell.feature" version="0.1.0.qualifier"/>
- <feature id="org.cishell.reference.feature" version="0.1.0.qualifier"/>
- <feature id="org.cishell.reference.gui.feature" version="0.1.0.qualifier"/>
+ <feature id="org.cishell.reference.feature" version="0.2.0.qualifier"/>
+ <feature id="org.cishell.reference.gui.feature" version="0.2.0.qualifier"/>
</features>
</product>
Modified: trunk/deployment/org.cishell.environment.equinox.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.environment.equinox.feature/feature.xml 2006-10-17 15:43:39 UTC (rev 294)
+++ trunk/deployment/org.cishell.environment.equinox.feature/feature.xml 2006-10-17 17:04:38 UTC (rev 295)
@@ -37,163 +37,157 @@
</url>
<plugin
- id="org.apache.xerces"
- download-size="0"
- install-size="0"
- version="2.8.0.v200606131651"/>
-
- <plugin
id="com.ibm.icu"
download-size="0"
install-size="0"
- version="3.4.5"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.core.commands"
download-size="0"
install-size="0"
- version="3.2.0.I20060605-1400"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.core.contenttype"
download-size="0"
install-size="0"
- version="3.2.0.v20060603"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.core.expressions"
download-size="0"
install-size="0"
- version="3.2.1.r321_v20060721"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.core.jobs"
download-size="0"
install-size="0"
- version="3.2.0.v20060603"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.core.runtime"
download-size="0"
install-size="0"
- version="3.2.0.v20060603"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.core.runtime.compatibility.auth"
download-size="0"
install-size="0"
- version="3.2.0.v20060601"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.core.runtime.compatibility.registry"
download-size="0"
install-size="0"
- version="3.2.1.R32x_v20060907"
+ version="0.0.0"
fragment="true"/>
<plugin
id="org.eclipse.equinox.common"
download-size="0"
install-size="0"
- version="3.2.0.v20060603"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.equinox.ds"
download-size="0"
install-size="0"
- version="1.0.0.qualifier"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.equinox.event"
download-size="0"
install-size="0"
- version="1.0.0.v20060601a"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.equinox.log"
download-size="0"
install-size="0"
- version="1.0.0.v20060601a"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.equinox.metatype"
download-size="0"
install-size="0"
- version="1.0.0.v20060601a"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.equinox.preferences"
download-size="0"
install-size="0"
- version="3.2.1.R32x_v20060717"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.equinox.registry"
download-size="0"
install-size="0"
- version="3.2.1.R32x_v20060814"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.equinox.useradmin"
download-size="0"
install-size="0"
- version="1.0.0.v20060601a"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.help"
download-size="0"
install-size="0"
- version="3.2.1.R321_v20060920"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jface"
download-size="0"
install-size="0"
- version="3.2.1.M20060908-1000"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.osgi"
download-size="0"
install-size="0"
- version="3.2.0.v20060601"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.osgi.services"
download-size="0"
install-size="0"
- version="3.1.100.v20060601"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.osgi.util"
download-size="0"
install-size="0"
- version="3.1.100.v20060601"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.swt"
download-size="0"
install-size="0"
- version="3.2.1.v3235e"
+ version="0.0.0"
unpack="false"/>
<plugin
@@ -202,7 +196,7 @@
ws="carbon"
download-size="0"
install-size="0"
- version="3.2.0.v3232m"
+ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -212,7 +206,7 @@
ws="carbon"
download-size="0"
install-size="0"
- version="3.2.0.I20060605-1400"
+ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -223,7 +217,7 @@
arch="ppc"
download-size="0"
install-size="0"
- version="3.2.0.v3232m"
+ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -234,7 +228,7 @@
arch="x86"
download-size="0"
install-size="0"
- version="3.2.1.v3235"
+ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -245,7 +239,7 @@
arch="x86_64"
download-size="0"
install-size="0"
- version="3.2.0.v3232m"
+ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -256,7 +250,7 @@
arch="sparc"
download-size="0"
install-size="0"
- version="3.2.0.v3232m"
+ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -267,7 +261,7 @@
arch="ppc"
download-size="0"
install-size="0"
- version="3.2.0.v3232m"
+ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -278,7 +272,7 @@
arch="PA_RISC"
download-size="0"
install-size="0"
- version="3.2.0.v3232m"
+ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -289,7 +283,7 @@
arch="x86"
download-size="0"
install-size="0"
- version="3.2.0.v3232m"
+ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -300,7 +294,7 @@
arch="x86"
download-size="0"
install-size="0"
- version="3.2.0.v3232m"
+ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -308,7 +302,7 @@
id="org.eclipse.ui"
download-size="0"
install-size="0"
- version="3.2.1.M20060913-0800"
+ version="0.0.0"
unpack="false"/>
<plugin
@@ -316,7 +310,7 @@
ws="carbon"
download-size="0"
install-size="0"
- version="3.2.0.I20060605-1400"
+ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -324,21 +318,21 @@
id="org.eclipse.ui.workbench"
download-size="0"
install-size="0"
- version="3.2.1.M20060906-0800"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.update.configurator"
download-size="0"
install-size="0"
- version="3.2.1.v20092006"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.update.core"
download-size="0"
install-size="0"
- version="3.2.1.v20092006"
+ version="0.0.0"
unpack="false"/>
<plugin
@@ -346,7 +340,7 @@
os="linux"
download-size="0"
install-size="0"
- version="3.2.0.v20060605"
+ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -355,7 +349,7 @@
os="win32"
download-size="0"
install-size="0"
- version="3.2.0.v20060605"
+ version="0.0.0"
fragment="true"
unpack="false"/>
@@ -363,14 +357,14 @@
id="org.eclipse.update.ui"
download-size="0"
install-size="0"
- version="3.2.1.v20092006"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.ui.forms"
download-size="0"
install-size="0"
- version="3.2.0.v20060602"
+ version="0.0.0"
unpack="false"/>
</feature>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bea...@us...> - 2006-10-17 15:44:05
|
Revision: 294
http://svn.sourceforge.net/cishell/?rev=294&view=rev
Author: bearsfan
Date: 2006-10-17 08:43:39 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
Check to see if a BundleContext is around to get a datamanager, commented out unused variable in TreeItemEditorListener
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 2006-10-17 15:40:07 UTC (rev 293)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/AbstractDataManagerView.java 2006-10-17 15:43:39 UTC (rev 294)
@@ -484,10 +484,10 @@
*/
private class TreeItemEditorListener extends MouseAdapter implements
KeyListener {
- private TreeEditor editor;
+ //private TreeEditor editor;
public TreeItemEditorListener(TreeEditor editor) {
- this.editor = editor;
+ //this.editor = editor;
}
public void keyReleased(KeyEvent e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bea...@us...> - 2006-10-17 15:42:54
|
Revision: 293
http://svn.sourceforge.net/cishell/?rev=293&view=rev
Author: bearsfan
Date: 2006-10-17 08:40:07 -0700 (Tue, 17 Oct 2006)
Log Message:
-----------
Check to see if a BundleContext is around to get a datamanager
Modified Paths:
--------------
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/Activator.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 2006-10-16 21:59:06 UTC (rev 292)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/AbstractDataManagerView.java 2006-10-17 15:40:07 UTC (rev 293)
@@ -58,6 +58,8 @@
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeItem;
import org.eclipse.ui.part.ViewPart;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.BundleListener;
import org.osgi.service.log.LogService;
/**
@@ -65,7 +67,7 @@
* @author Bruce Herr (bh...@bh...)
*/
public abstract class AbstractDataManagerView extends ViewPart implements
- DataManagerListener {
+ DataManagerListener, BundleListener {
private String brandPluginID;
private DataManagerService manager;
@@ -165,11 +167,27 @@
tree.addMouseListener(editorListener);
tree.addKeyListener(editorListener);
- // listen to IVC for models being added by plugins
- manager.addDataManagerListener(this);
+ // listen to OSGi for models being added by plugins
+ if (manager != null) {
+ manager.addDataManagerListener(this);
+ }
+ else {
+ Activator.getBundleContext().addBundleListener(this);
+ manager = Activator.getDataManagerService();
+ if (manager != null) {
+ manager.addDataManagerListener(this);
+ }
+ }
getSite().setSelectionProvider(new DataModelSelectionProvider());
}
+
+ public void bundleChanged(BundleEvent event) {
+ if (event.getType() == BundleEvent.STARTED) {
+ manager = Activator.getDataManagerService();
+ manager.addDataManagerListener(this);
+ }
+ }
/**
* @see org.eclipse.ui.part.WorkbenchPart#setFocus()
Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/Activator.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/Activator.java 2006-10-16 21:59:06 UTC (rev 292)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/Activator.java 2006-10-17 15:40:07 UTC (rev 293)
@@ -36,7 +36,7 @@
*/
public void start(BundleContext context) throws Exception {
super.start(context);
-
+
Activator.context = context;
}
@@ -59,9 +59,14 @@
}
protected static DataManagerService getDataManagerService() {
- DataManagerService manager = (DataManagerService) context.getService(
- context.getServiceReference(DataManagerService.class.getName()));
+ ServiceReference serviceReference = context.getServiceReference(DataManagerService.class.getName());
+ DataManagerService manager = null;
+ if (serviceReference != null) {
+ manager = (DataManagerService) context.getService(serviceReference);
+
+ }
+
return manager;
}
@@ -87,6 +92,10 @@
return null;
}
}
+
+ protected static BundleContext getBundleContext() {
+ return context;
+ }
protected static CIShellContext getCIShellContext() {
return new LocalCIShellContext(context);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-16 22:03:50
|
Revision: 290
http://svn.sourceforge.net/cishell/?rev=290&view=rev
Author: bh2
Date: 2006-10-16 14:57:55 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
version bump to 0.2.0
Modified Paths:
--------------
trunk/deployment/org.cishell.environment.equinox.feature/feature.xml
Modified: trunk/deployment/org.cishell.environment.equinox.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.environment.equinox.feature/feature.xml 2006-10-16 21:28:06 UTC (rev 289)
+++ trunk/deployment/org.cishell.environment.equinox.feature/feature.xml 2006-10-16 21:57:55 UTC (rev 290)
@@ -40,160 +40,160 @@
id="org.apache.xerces"
download-size="0"
install-size="0"
- version="0.0.0"/>
+ version="2.8.0.v200606131651"/>
<plugin
id="com.ibm.icu"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.4.5"
unpack="false"/>
<plugin
id="org.eclipse.core.commands"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.I20060605-1400"
unpack="false"/>
<plugin
id="org.eclipse.core.contenttype"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v20060603"
unpack="false"/>
<plugin
id="org.eclipse.core.expressions"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.1.r321_v20060721"
unpack="false"/>
<plugin
id="org.eclipse.core.jobs"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v20060603"
unpack="false"/>
<plugin
id="org.eclipse.core.runtime"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v20060603"
unpack="false"/>
<plugin
id="org.eclipse.core.runtime.compatibility.auth"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v20060601"
unpack="false"/>
<plugin
id="org.eclipse.core.runtime.compatibility.registry"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.1.R32x_v20060907"
fragment="true"/>
<plugin
id="org.eclipse.equinox.common"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v20060603"
unpack="false"/>
<plugin
id="org.eclipse.equinox.ds"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="1.0.0.qualifier"
unpack="false"/>
<plugin
id="org.eclipse.equinox.event"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="1.0.0.v20060601a"
unpack="false"/>
<plugin
id="org.eclipse.equinox.log"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="1.0.0.v20060601a"
unpack="false"/>
<plugin
id="org.eclipse.equinox.metatype"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="1.0.0.v20060601a"
unpack="false"/>
<plugin
id="org.eclipse.equinox.preferences"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.1.R32x_v20060717"
unpack="false"/>
<plugin
id="org.eclipse.equinox.registry"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.1.R32x_v20060814"
unpack="false"/>
<plugin
id="org.eclipse.equinox.useradmin"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="1.0.0.v20060601a"
unpack="false"/>
<plugin
id="org.eclipse.help"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.1.R321_v20060920"
unpack="false"/>
<plugin
id="org.eclipse.jface"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.1.M20060908-1000"
unpack="false"/>
<plugin
id="org.eclipse.osgi"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v20060601"
unpack="false"/>
<plugin
id="org.eclipse.osgi.services"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.1.100.v20060601"
unpack="false"/>
<plugin
id="org.eclipse.osgi.util"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.1.100.v20060601"
unpack="false"/>
<plugin
id="org.eclipse.swt"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.1.v3235e"
unpack="false"/>
<plugin
@@ -202,7 +202,7 @@
ws="carbon"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v3232m"
fragment="true"
unpack="false"/>
@@ -212,7 +212,7 @@
ws="carbon"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.I20060605-1400"
fragment="true"
unpack="false"/>
@@ -223,7 +223,7 @@
arch="ppc"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v3232m"
fragment="true"
unpack="false"/>
@@ -234,7 +234,7 @@
arch="x86"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.1.v3235"
fragment="true"
unpack="false"/>
@@ -245,7 +245,7 @@
arch="x86_64"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v3232m"
fragment="true"
unpack="false"/>
@@ -256,7 +256,7 @@
arch="sparc"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v3232m"
fragment="true"
unpack="false"/>
@@ -267,7 +267,7 @@
arch="ppc"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v3232m"
fragment="true"
unpack="false"/>
@@ -278,7 +278,7 @@
arch="PA_RISC"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v3232m"
fragment="true"
unpack="false"/>
@@ -289,7 +289,7 @@
arch="x86"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v3232m"
fragment="true"
unpack="false"/>
@@ -300,7 +300,7 @@
arch="x86"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v3232m"
fragment="true"
unpack="false"/>
@@ -308,7 +308,7 @@
id="org.eclipse.ui"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.1.M20060913-0800"
unpack="false"/>
<plugin
@@ -316,7 +316,7 @@
ws="carbon"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.I20060605-1400"
fragment="true"
unpack="false"/>
@@ -324,21 +324,21 @@
id="org.eclipse.ui.workbench"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.1.M20060906-0800"
unpack="false"/>
<plugin
id="org.eclipse.update.configurator"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.1.v20092006"
unpack="false"/>
<plugin
id="org.eclipse.update.core"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.1.v20092006"
unpack="false"/>
<plugin
@@ -346,7 +346,7 @@
os="linux"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v20060605"
fragment="true"
unpack="false"/>
@@ -355,7 +355,7 @@
os="win32"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v20060605"
fragment="true"
unpack="false"/>
@@ -363,14 +363,14 @@
id="org.eclipse.update.ui"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.1.v20092006"
unpack="false"/>
<plugin
id="org.eclipse.ui.forms"
download-size="0"
install-size="0"
- version="0.0.0"
+ version="3.2.0.v20060602"
unpack="false"/>
</feature>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-16 21:59:18
|
Revision: 292
http://svn.sourceforge.net/cishell/?rev=292&view=rev
Author: bh2
Date: 2006-10-16 14:59:06 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
Added Paths:
-----------
trunk/deployment/org.cishell.update/.settings/
trunk/deployment/org.cishell.update/.settings/org.eclipse.ltk.core.refactoring.prefs
trunk/deployment/org.cishell.update/.settings/org.eclipse.wst.validation.prefs
Added: trunk/deployment/org.cishell.update/.settings/org.eclipse.ltk.core.refactoring.prefs
===================================================================
--- trunk/deployment/org.cishell.update/.settings/org.eclipse.ltk.core.refactoring.prefs (rev 0)
+++ trunk/deployment/org.cishell.update/.settings/org.eclipse.ltk.core.refactoring.prefs 2006-10-16 21:59:06 UTC (rev 292)
@@ -0,0 +1,3 @@
+#Mon Oct 16 17:46:30 EDT 2006
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
Added: trunk/deployment/org.cishell.update/.settings/org.eclipse.wst.validation.prefs
===================================================================
--- trunk/deployment/org.cishell.update/.settings/org.eclipse.wst.validation.prefs (rev 0)
+++ trunk/deployment/org.cishell.update/.settings/org.eclipse.wst.validation.prefs 2006-10-16 21:59:06 UTC (rev 292)
@@ -0,0 +1,6 @@
+#Mon Oct 16 17:46:31 EDT 2006
+DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;
+USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.j2ee.internal.ejb.workbench.validation.UIEjbValidator;
+USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.jst.j2ee.internal.ejb.workbench.validation.UIEjbValidator;
+USER_PREFERENCE=overrideGlobalPreferencesfalse
+eclipse.preferences.version=1
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-16 21:58:31
|
Revision: 291
http://svn.sourceforge.net/cishell/?rev=291&view=rev
Author: bh2
Date: 2006-10-16 14:58:14 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
version bump to 0.2.0
Modified Paths:
--------------
trunk/deployment/org.cishell.update/site.xml
Modified: trunk/deployment/org.cishell.update/site.xml
===================================================================
--- trunk/deployment/org.cishell.update/site.xml 2006-10-16 21:57:55 UTC (rev 290)
+++ trunk/deployment/org.cishell.update/site.xml 2006-10-16 21:58:14 UTC (rev 291)
@@ -3,24 +3,21 @@
<description url="http://cishell.org/update">
Update site for CIShell: Cyberinfrastructure Shell
</description>
- <feature url="features/org.cishell.feature_0.0.1.200609131643.jar" id="org.cishell.feature" version="0.0.1.200609131643">
- <category name="Core Features"/>
+ <feature url="features/org.cishell.algorithm.examples.feature_0.2.0.200610161755.jar" id="org.cishell.algorithm.examples.feature" version="0.2.0.200610161755">
+ <category name="Development"/>
</feature>
- <feature url="features/org.cishell.reference.gui.feature_0.0.1.200609210951.jar" id="org.cishell.reference.gui.feature" version="0.0.1.200609210951">
+ <feature url="features/org.cishell.development.feature_0.2.0.200610161755.jar" id="org.cishell.development.feature" version="0.2.0.200610161755">
+ <category name="Development"/>
+ </feature>
+ <feature url="features/org.cishell.reference.gui.feature_0.2.0.200610161755.jar" id="org.cishell.reference.gui.feature" version="0.2.0.200610161755">
<category name="Applications"/>
</feature>
- <feature url="features/org.cishell.environment.equinox.feature_0.0.1.jar" id="org.cishell.environment.equinox.feature" version="0.0.1">
+ <feature url="features/org.cishell.feature_0.2.0.200610161755.jar" id="org.cishell.feature" version="0.2.0.200610161755">
<category name="Core Features"/>
</feature>
- <feature url="features/org.cishell.reference.feature_0.0.1.200609131643.jar" id="org.cishell.reference.feature" version="0.0.1.200609131643">
+ <feature url="features/org.cishell.reference.feature_0.2.0.200610161755.jar" id="org.cishell.reference.feature" version="0.2.0.200610161755">
<category name="Core Features"/>
</feature>
- <feature url="features/org.cishell.algorithm.examples.feature_0.0.1.200609131643.jar" id="org.cishell.algorithm.examples.feature" version="0.0.1.200609131643">
- <category name="Development"/>
- </feature>
- <feature url="features/org.cishell.development.feature_0.0.1.200609181727.jar" id="org.cishell.development.feature" version="0.0.1.200609181727">
- <category name="Development"/>
- </feature>
<category-def name="Development" label="Development"/>
<category-def name="Applications" label="Applications">
<description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-16 21:32:22
|
Revision: 289
http://svn.sourceforge.net/cishell/?rev=289&view=rev
Author: bh2
Date: 2006-10-16 14:28:06 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
version bump to 0.2.0
Modified Paths:
--------------
trunk/deployment/org.cishell.reference.feature/feature.xml
Modified: trunk/deployment/org.cishell.reference.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.reference.feature/feature.xml 2006-10-16 21:25:48 UTC (rev 288)
+++ trunk/deployment/org.cishell.reference.feature/feature.xml 2006-10-16 21:28:06 UTC (rev 289)
@@ -2,7 +2,7 @@
<feature
id="org.cishell.reference.feature"
label="CIShell Reference Bundles"
- version="0.1.0.qualifier">
+ version="0.2.0.qualifier">
<description url="http://cishell.org">
CIShell Reference Bundles
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-16 21:30:01
|
Revision: 288
http://svn.sourceforge.net/cishell/?rev=288&view=rev
Author: bh2
Date: 2006-10-16 14:25:48 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
version bump to 0.2.0
Modified Paths:
--------------
trunk/deployment/cishell-installer/thanks.txt
Modified: trunk/deployment/cishell-installer/thanks.txt
===================================================================
--- trunk/deployment/cishell-installer/thanks.txt 2006-10-16 21:21:18 UTC (rev 287)
+++ trunk/deployment/cishell-installer/thanks.txt 2006-10-16 21:25:48 UTC (rev 288)
@@ -1,7 +1,8 @@
Installation of CIShell: Cyberinfrastructure Shell was successful!
This release adds several algorithms and converters to give an idea of
-what a filling of CIShell would be like.
+what a filling of CIShell would be like. Also, automatic multi-step
+data conversion has been implemented in this version.
WARNING: This is an alpha release of CIShell. This means that not all
the functionality is there, there will be bugs, and that the final
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-16 21:26:31
|
Revision: 287
http://svn.sourceforge.net/cishell/?rev=287&view=rev
Author: bh2
Date: 2006-10-16 14:21:18 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
version bump to 0.2.0
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF
trunk/clients/gui/org.cishell.reference.gui.datamanager/META-INF/MANIFEST.MF
trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/META-INF/MANIFEST.MF
trunk/clients/gui/org.cishell.reference.gui.guibuilder.temp/META-INF/MANIFEST.MF
trunk/clients/gui/org.cishell.reference.gui.log/META-INF/MANIFEST.MF
trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF
trunk/clients/gui/org.cishell.reference.gui.persistence/META-INF/MANIFEST.MF
trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF
trunk/core/org.cishell.framework/META-INF/MANIFEST.MF
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
trunk/deployment/cishell-installer/build.xml
trunk/deployment/cishell-installer/install.xml
trunk/deployment/cishell-installer/thanks.txt
trunk/deployment/org.cishell.algorithm.examples.feature/feature.xml
trunk/deployment/org.cishell.development.feature/feature.xml
trunk/deployment/org.cishell.feature/feature.xml
trunk/deployment/org.cishell.reference.feature/feature.xml
trunk/deployment/org.cishell.reference.gui.feature/feature.xml
Modified: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF 2006-10-16 21:21:18 UTC (rev 287)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CIShell Branding Plug-in
Bundle-SymbolicName: org.cishell.reference.gui.brand.cishell;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0
Bundle-Activator: org.cishell.reference.gui.brand.cishell.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/META-INF/MANIFEST.MF 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/META-INF/MANIFEST.MF 2006-10-16 21:21:18 UTC (rev 287)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Data Manager GUI Plug-in
Bundle-SymbolicName: org.cishell.reference.gui.datamanager;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0
Bundle-Activator: org.cishell.reference.gui.datamanager.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
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 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/META-INF/MANIFEST.MF 2006-10-16 21:21:18 UTC (rev 287)
@@ -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.1.0.qualifier
+Bundle-Version: 0.2.0
Bundle-Localization: plugin
Import-Package: org.cishell.framework,
org.cishell.service.guibuilder,
Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.temp/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.temp/META-INF/MANIFEST.MF 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.temp/META-INF/MANIFEST.MF 2006-10-16 21:21:18 UTC (rev 287)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Temporary GUI Builder Plugin
Bundle-SymbolicName: org.cishell.reference.gui.guibuilder.temp
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
edu.iu.iv.common,
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 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/clients/gui/org.cishell.reference.gui.log/META-INF/MANIFEST.MF 2006-10-16 21:21:18 UTC (rev 287)
@@ -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.1.0.qualifier
+Bundle-Version: 0.2.0
Bundle-Activator: org.cishell.reference.gui.log.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
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 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF 2006-10-16 21:21:18 UTC (rev 287)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Menu Manager Plug-in
Bundle-SymbolicName: org.cishell.reference.gui.menumanager;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0
Bundle-Activator: org.cishell.reference.gui.menumanager.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/META-INF/MANIFEST.MF
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/META-INF/MANIFEST.MF 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/META-INF/MANIFEST.MF 2006-10-16 21:21:18 UTC (rev 287)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Persistence Plug-in
Bundle-SymbolicName: org.cishell.reference.gui.persistence;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.2.0
Bundle-ClassPath: .
Bundle-Localization: plugin
Import-Package: org.cishell.app.service.datamanager,
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 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF 2006-10-16 21:21:18 UTC (rev 287)
@@ -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.1.0.qualifier
+Bundle-Version: 0.2.0
Bundle-Activator: org.cishell.reference.gui.workspace.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui,
Modified: trunk/core/org.cishell.framework/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/org.cishell.framework/META-INF/MANIFEST.MF 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/core/org.cishell.framework/META-INF/MANIFEST.MF 2006-10-16 21:21:18 UTC (rev 287)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CIShell Framework API
Bundle-SymbolicName: org.cishell.framework
-Bundle-Version: 0.1.0
+Bundle-Version: 0.2.0
Bundle-Vendor: Bruce Herr
Bundle-Localization: plugin
Import-Package: org.osgi.framework,
Modified: trunk/core/org.cishell.reference/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/org.cishell.reference/META-INF/MANIFEST.MF 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/core/org.cishell.reference/META-INF/MANIFEST.MF 2006-10-16 21:21:18 UTC (rev 287)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CIShell Reference Service Implementations
Bundle-SymbolicName: org.cishell.reference
-Bundle-Version: 0.1.0
+Bundle-Version: 0.2.0
Bundle-Localization: plugin
Import-Package: org.cishell.app.service.datamanager,
org.cishell.app.service.scheduler,
Modified: trunk/core/org.cishell.reference.services/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/org.cishell.reference.services/META-INF/MANIFEST.MF 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/core/org.cishell.reference.services/META-INF/MANIFEST.MF 2006-10-16 21:21:18 UTC (rev 287)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Reference Services Starter
Bundle-SymbolicName: org.cishell.reference.services
-Bundle-Version: 0.1.0
+Bundle-Version: 0.2.0
Bundle-Activator: org.cishell.reference.services.Activator
Bundle-Localization: plugin
X-AutoStart: true
Modified: trunk/core/org.cishell.service.autostart/META-INF/MANIFEST.MF
===================================================================
--- trunk/core/org.cishell.service.autostart/META-INF/MANIFEST.MF 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/core/org.cishell.service.autostart/META-INF/MANIFEST.MF 2006-10-16 21:21:18 UTC (rev 287)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CIShell Bundler Autostarter
Bundle-SymbolicName: org.cishell.service.autostart
-Bundle-Version: 0.1.0
+Bundle-Version: 0.2.0
Bundle-Activator: org.cishell.service.autostart.Activator
Bundle-Localization: plugin
Import-Package: org.osgi.framework;version="1.3.0"
Modified: trunk/deployment/cishell-installer/build.xml
===================================================================
--- trunk/deployment/cishell-installer/build.xml 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/deployment/cishell-installer/build.xml 2006-10-16 21:21:18 UTC (rev 287)
@@ -12,7 +12,7 @@
<project name='CIShell Installer' default='compile' basedir='.'>
<!-- Properties -->
- <property name="version" value="0.1.0"/>
+ <property name="version" value="0.2.0"/>
<property name="full.xml" value="install.xml"/>
<property name="min.xml" value="install.xml"/>
<property name="full.jar" value="cishell-installer_${version}.alpha.jar"/>
Modified: trunk/deployment/cishell-installer/install.xml
===================================================================
--- trunk/deployment/cishell-installer/install.xml 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/deployment/cishell-installer/install.xml 2006-10-16 21:21:18 UTC (rev 287)
@@ -16,7 +16,7 @@
<info>
<appname>CIShell: Cyberinfrastructure Shell</appname>
<appsubpath>cishell</appsubpath>
- <appversion>0.1.0</appversion>
+ <appversion>0.2.0</appversion>
<authors>
<author name="Bruce Herr" email="bh...@bh..." />
<author name="Weixia Huang" email="hu...@in..." />
Modified: trunk/deployment/cishell-installer/thanks.txt
===================================================================
--- trunk/deployment/cishell-installer/thanks.txt 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/deployment/cishell-installer/thanks.txt 2006-10-16 21:21:18 UTC (rev 287)
@@ -1,9 +1,12 @@
Installation of CIShell: Cyberinfrastructure Shell was successful!
-WARNING: This is an early alpha release of CIShell.
+This release adds several algorithms and converters to give an idea of
+what a filling of CIShell would be like.
-Also, there are no algorithms integrated. This release is mainly only
-useful for early adopters for testing integration of their own algorithms.
+WARNING: This is an alpha release of CIShell. This means that not all
+the functionality is there, there will be bugs, and that the final
+feature set is not yet set in stone. If you have bug reports, comments,
+or feature requests please feel free to contact us as described below.
If you have any problems, please contact the CIShell development team at
cis...@li....
Modified: trunk/deployment/org.cishell.algorithm.examples.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.algorithm.examples.feature/feature.xml 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/deployment/org.cishell.algorithm.examples.feature/feature.xml 2006-10-16 21:21:18 UTC (rev 287)
@@ -2,7 +2,7 @@
<feature
id="org.cishell.algorithm.examples.feature"
label="CIShell Sample Algorithms"
- version="0.1.0.qualifier">
+ version="0.2.0.qualifier">
<description>
Example algorithms for development and testing of CIShell.
@@ -37,17 +37,170 @@
</url>
<plugin
- id="org.cishell.tests.conversion1"
+ id="org.cishell.tests.guibuilder1"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.cishell.tests.guibuilder1"
+ id="edu.iu.iv.attacktolerance"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="edu.iu.iv.clustering.betweennesscentrality"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.iv.errortolerance"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.iv.modeling.barabasialbertmodel"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.iv.modeling.p2p.can"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.iv.modeling.p2p.chord"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.iv.modeling.p2p.hypergrid"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.iv.modeling.p2p.pru"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.iv.modeling.p2p.randomnetwork"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.iv.preprocessing.directoryhierarchyreader"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.iv.search.p2p.bfs"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.iv.search.p2p.randomwalk"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.iv.treemap"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.iv.visualization.treeviz"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.nwb.converter.junggraphml"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.nwb.converter.jungpajeknet"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.nwb.converter.jungprefuse"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.nwb.converter.prefusegraphml"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.nwb.converter.prefusexgmml"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.nwb.visualization.forcedirectedlayout"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.nwb.visualization.jungnetworklayout"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.iu.nwb.visualization.radialgraph"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.prefuse.lib"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
Modified: trunk/deployment/org.cishell.development.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.development.feature/feature.xml 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/deployment/org.cishell.development.feature/feature.xml 2006-10-16 21:21:18 UTC (rev 287)
@@ -2,7 +2,7 @@
<feature
id="org.cishell.development.feature"
label="CIShell Algorithm Development Plug-In"
- version="0.1.0.qualifier">
+ version="0.2.0.qualifier">
<description url="http://cishell.org">
The CIShell Algorithm Development Pack
Modified: trunk/deployment/org.cishell.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.feature/feature.xml 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/deployment/org.cishell.feature/feature.xml 2006-10-16 21:21:18 UTC (rev 287)
@@ -2,7 +2,7 @@
<feature
id="org.cishell.feature"
label="CIShell Framework API Feature"
- version="0.1.0.qualifier">
+ version="0.2.0.qualifier">
<description url="http://cishell.org">
CIShell Framework API
Modified: trunk/deployment/org.cishell.reference.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.reference.feature/feature.xml 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/deployment/org.cishell.reference.feature/feature.xml 2006-10-16 21:21:18 UTC (rev 287)
@@ -57,4 +57,29 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.cishell.templates"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="edu.uci.ics.jung"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.apache.commons.collections"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+ <plugin
+ id="cern.colt"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
</feature>
Modified: trunk/deployment/org.cishell.reference.gui.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.reference.gui.feature/feature.xml 2006-10-16 20:40:27 UTC (rev 286)
+++ trunk/deployment/org.cishell.reference.gui.feature/feature.xml 2006-10-16 21:21:18 UTC (rev 287)
@@ -2,7 +2,7 @@
<feature
id="org.cishell.reference.gui.feature"
label="CIShell Reference GUI"
- version="0.1.0.qualifier">
+ version="0.2.0.qualifier">
<description url="http://cishell.org">
CIShell Reference GUI
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-16 20:40:48
|
Revision: 286
http://svn.sourceforge.net/cishell/?rev=286&view=rev
Author: bh2
Date: 2006-10-16 13:40:27 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
put a bandaid on the persistence plugin. This code needs cleaned up B-A-D!
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/LoadDataChooser.java
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/LoadDataChooser.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/LoadDataChooser.java 2006-10-16 19:42:12 UTC (rev 285)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/LoadDataChooser.java 2006-10-16 20:40:27 UTC (rev 286)
@@ -6,9 +6,14 @@
*/
package org.cishell.reference.gui.persistence.load;
+import java.io.File;
import java.util.ArrayList;
-import java.io.File;
+import org.cishell.framework.CIShellContext;
+import org.cishell.framework.algorithm.AlgorithmFactory;
+import org.cishell.framework.data.BasicData;
+import org.cishell.framework.data.Data;
+import org.cishell.reference.gui.common.AbstractDialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyleRange;
import org.eclipse.swt.custom.StyledText;
@@ -22,18 +27,10 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.Shell;
-
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.log.LogService;
-import org.cishell.framework.CIShellContext;
-import org.cishell.framework.algorithm.AlgorithmFactory;
-import org.cishell.framework.data.BasicData;
-import org.cishell.framework.data.Data;
-
-import org.cishell.reference.gui.common.AbstractDialog;
-
/**
*
* @author Team IVC (Weixia Huang, James Ellis)
@@ -162,15 +159,25 @@
}
private void selectionMade(int selectedIndex) {
-
- logger.log(LogService.LOG_INFO, "Loaded: "+theFile.getPath());
AlgorithmFactory persister =(AlgorithmFactory) bContext.getService(persisterArray[selectedIndex]);
- Data[] dm = new Data[]{new BasicData(theFile.getPath(),String.class.getName())};
- dm = persister.createAlgorithm(dm, null, ciContext).execute();
- for(int i = 0; i<dm.length; i++){
- returnList.add(dm[i]);
- }
- close(true);
+ Data[] dm = null;
+ try {
+ dm = new Data[]{new BasicData(theFile.getPath(),String.class.getName())};
+ dm = persister.createAlgorithm(dm, null, ciContext).execute();
+ } catch (Throwable e) {
+ e.printStackTrace();
+ }
+
+ if (dm != null) {
+ logger.log(LogService.LOG_INFO, "Loaded: "+theFile.getPath());
+
+ for(int i = 0; i<dm.length; i++){
+ returnList.add(dm[i]);
+ }
+ close(true);
+ } else {
+ logger.log(LogService.LOG_ERROR, "Unable to load with selected loader");
+ }
}
public void createDialogButtons(Composite parent) {
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java 2006-10-16 19:42:12 UTC (rev 285)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java 2006-10-16 20:40:27 UTC (rev 286)
@@ -8,6 +8,7 @@
import org.cishell.service.conversion.Converter;
import org.cishell.service.conversion.DataConversionService;
import org.cishell.service.guibuilder.GUIBuilderService;
+import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
@@ -63,17 +64,30 @@
}
else {
if (!parentShell.isDisposed()) {
- parentShell.getDisplay().syncExec(new Runnable() {
+ guiRun(new Runnable() {
public void run() {
- SaveDataChooser sdc = new SaveDataChooser(data[0],
- parentShell, converters,
- "Save",
- context);
- sdc.createContent(parentShell);
- sdc.open();
+ if (converters.length == 1) {
+ final FileSaver saver = new FileSaver(parentShell, context);
+ saver.save(converters[0], data[0]);
+ } else {
+ SaveDataChooser sdc = new SaveDataChooser(data[0],
+ parentShell, converters,
+ "Save",
+ context);
+ sdc.createContent(new Shell(parentShell));
+ sdc.open();
+ }
}});
}
}
return null;
}
+
+ private void guiRun(Runnable run) {
+ if (Thread.currentThread() == Display.getDefault().getThread()) {
+ run.run();
+ } else {
+ parentShell.getDisplay().syncExec(run);
+ }
+ }
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-16 19:42:18
|
Revision: 285
http://svn.sourceforge.net/cishell/?rev=285&view=rev
Author: bh2
Date: 2006-10-16 12:42:12 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
changed colt's bundle id to cern.colt
Modified Paths:
--------------
trunk/libs/cern.colt/META-INF/MANIFEST.MF
Modified: trunk/libs/cern.colt/META-INF/MANIFEST.MF
===================================================================
--- trunk/libs/cern.colt/META-INF/MANIFEST.MF 2006-10-16 19:35:06 UTC (rev 284)
+++ trunk/libs/cern.colt/META-INF/MANIFEST.MF 2006-10-16 19:42:12 UTC (rev 285)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Coltlib Plug-in
-Bundle-SymbolicName: coltlib
+Bundle-SymbolicName: cern.colt
Bundle-Version: 1.2.0
Bundle-ClassPath: colt.jar
Bundle-Localization: plugin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-16 19:35:11
|
Revision: 284
http://svn.sourceforge.net/cishell/?rev=284&view=rev
Author: bh2
Date: 2006-10-16 12:35:06 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
some minor fixes and documentation
Modified Paths:
--------------
trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java
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 2006-10-16 19:34:05 UTC (rev 283)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java 2006-10-16 19:35:06 UTC (rev 284)
@@ -115,7 +115,7 @@
* @see org.cishell.service.conversion.DataConversionService#findConverters(java.lang.String, java.lang.String)
*/
public Converter[] findConverters(String inFormat, String outFormat) {
- saveGraph();
+ //saveGraph();
if (inFormat != null && inFormat.length() > 0 &&
outFormat != null && outFormat.length() > 0) {
@@ -141,8 +141,8 @@
String format = (String) converters[i].getProperties().get(OUT_DATA);
//tmp
- String inFormat = (String) converters[i].getProperties().get(IN_DATA);
- System.out.println("Converter:"+converters.length+":"+ inFormat + "->" + format + "->" + outFormat);
+ //String inFormat = (String) converters[i].getProperties().get(IN_DATA);
+ //System.out.println("Converter:"+converters.length+":"+ inFormat + "->" + format + "->" + outFormat);
if (!formats.contains(format)) {
String filter = "(&("+ALGORITHM_TYPE+"="+TYPE_CONVERTER+")" +
@@ -188,10 +188,9 @@
Collection converterList = new HashSet();
- //TODO: Check to see if inFormat matches the outFormat (for example:
- //in=file:text/graphml out=file:* If so, need to add a null converter
- //(w/ 0 sized servicereference array) to the converterList
-
+ //Check to see if inFormat matches the outFormat (for example:
+ //in=file:text/graphml out=file:* If so, then add a null converter
+ //to the converterList.
if (outFormat.indexOf('*') != -1) {
String outFormatCopy = outFormat.replaceAll("[*]", ".*");
if (Pattern.matches(outFormatCopy, inFormat)) {
@@ -272,7 +271,7 @@
public Converter[] findConverters(Data data, String outFormat) {
if (data == null) {
if (NULL_DATA.equalsIgnoreCase(""+outFormat)) {
- return new Converter[]{new ConverterImpl(bContext, ciContext, new ServiceReference[0])};
+ return new Converter[]{new NullConverter(""+outFormat)};
} else {
return new Converter[0];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-16 19:34:11
|
Revision: 283
http://svn.sourceforge.net/cishell/?rev=283&view=rev
Author: bh2
Date: 2006-10-16 12:34:05 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
Made FileSaver print to the console upon successful load rather than popping up a gui
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2006-10-16 19:33:28 UTC (rev 282)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2006-10-16 19:34:05 UTC (rev 283)
@@ -19,6 +19,7 @@
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Shell;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
/**
* Persist the file to disk for the user
@@ -31,6 +32,7 @@
private Shell parent;
private GUIBuilderService guiBuilder;
+ private LogService log;
/**
@@ -42,6 +44,7 @@
public FileSaver(Shell parent, CIShellContext context){
this.parent = parent;
this.guiBuilder = (GUIBuilderService)context.getService(GUIBuilderService.class.getName());
+ this.log = (LogService) context.getService(LogService.class.getName());
}
/**
@@ -134,9 +137,7 @@
done = true;
- guiBuilder.showInformation("Data Saved",
- "Data successfully saved to disk",
- "Saved: " + selectedFile.getPath());
+ log.log(LogService.LOG_INFO, "Saved: " + selectedFile.getPath());
} else {
done = true;
return false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 282
http://svn.sourceforge.net/cishell/?rev=282&view=rev
Author: bh2
Date: 2006-10-16 12:33:28 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
if a data object is added to the data manager and the parent data object isn't in the gui then it will parent the added data object to the root
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 2006-10-16 17:13:55 UTC (rev 281)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/AbstractDataManagerView.java 2006-10-16 19:33:28 UTC (rev 282)
@@ -190,6 +190,11 @@
} else {
// otherwise find the associated DataModelGUIItem for the parent
parentItem = (DataGUIItem) dataToDataGUIItemMap.get(parent);
+
+ //The parent may not be in the GUI. If its not, then use root item
+ if (parentItem == null) {
+ parentItem = rootItem;
+ }
}
// create the new DataModelGUIItem
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-16 17:14:08
|
Revision: 281
http://svn.sourceforge.net/cishell/?rev=281&view=rev
Author: bh2
Date: 2006-10-16 10:13:55 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
* cleaned up the converter text
* made save grab the label from the last converter
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java 2006-10-16 15:04:20 UTC (rev 280)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveDataChooser.java 2006-10-16 17:13:55 UTC (rev 281)
@@ -29,6 +29,7 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.List;
import org.eclipse.swt.widgets.Shell;
+import org.osgi.framework.ServiceReference;
/**
* SaveDataChooser is a simple user interface to allow for selection
@@ -121,7 +122,17 @@
Dictionary dict = converterArray[i].getProperties();
// get the name of the persister from the property map
- String outData = (String) dict.get(AlgorithmProperty.LABEL);
+ String outData = null;
+
+ ServiceReference[] refs = converterArray[i].getConverterChain();
+ if (refs != null && refs.length > 0) {
+ outData = (String) refs[refs.length-1].getProperty(
+ AlgorithmProperty.LABEL);
+ }
+
+ if (outData == null) {
+ outData = (String) dict.get(AlgorithmProperty.LABEL);
+ }
// if someone was sloppy enough to not provide a name, then use
// the
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bea...@us...> - 2006-10-16 15:04:32
|
Revision: 280
http://svn.sourceforge.net/cishell/?rev=280&view=rev
Author: bearsfan
Date: 2006-10-16 08:04:20 -0700 (Mon, 16 Oct 2006)
Log Message:
-----------
Changed the title in the SaveDataChooser, added NullConverter, and a check for a converter path to itself
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java
trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java
Added Paths:
-----------
trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/NullConverter.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java 2006-10-14 15:53:43 UTC (rev 279)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java 2006-10-16 15:04:20 UTC (rev 280)
@@ -67,7 +67,7 @@
public void run() {
SaveDataChooser sdc = new SaveDataChooser(data[0],
parentShell, converters,
- "title",
+ "Save",
context);
sdc.createContent(parentShell);
sdc.open();
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 2006-10-14 15:53:43 UTC (rev 279)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java 2006-10-16 15:04:20 UTC (rev 280)
@@ -24,6 +24,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.regex.Pattern;
import org.cishell.framework.CIShellContext;
import org.cishell.framework.algorithm.AlgorithmFactory;
@@ -191,6 +192,13 @@
//in=file:text/graphml out=file:* If so, need to add a null converter
//(w/ 0 sized servicereference array) to the converterList
+ if (outFormat.indexOf('*') != -1) {
+ String outFormatCopy = outFormat.replaceAll("[*]", ".*");
+ if (Pattern.matches(outFormatCopy, inFormat)) {
+ converterList.add(new NullConverter(inFormat));
+ }
+ }
+
try {
ServiceReference[] inRefs = bContext.getServiceReferences(
AlgorithmFactory.class.getName(), inFilter);
@@ -230,10 +238,6 @@
Vertex srcVertex = (Vertex)dataTypeToVertex.get(inType);
Vertex tgtVertex = (Vertex)dataTypeToVertex.get(outType);
- if (srcVertex.equals(tgtVertex)) {
- return new ConverterImpl(bContext, ciContext, new ServiceReference[0]);
- }
-
if (srcVertex != null && tgtVertex != null) {
DijkstraShortestPath shortestPathAlg = new DijkstraShortestPath(graph);
List edgeList = shortestPathAlg.getPath(srcVertex, tgtVertex);
Added: trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/NullConverter.java
===================================================================
--- trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/NullConverter.java (rev 0)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/NullConverter.java 2006-10-16 15:04:20 UTC (rev 280)
@@ -0,0 +1,121 @@
+/* ****************************************************************************
+ * CIShell: Cyberinfrastructure Shell, An Algorithm Integration Framework.
+ *
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Apache License v2.0 which accompanies
+ * this distribution, and is available at:
+ * http://www.apache.org/licenses/LICENSE-2.0.html
+ *
+ * Created on Jul 20, 2006 at Indiana University.
+ *
+ * Contributors:
+ * Indiana University -
+ * ***************************************************************************/
+package org.cishell.reference.service.conversion;
+
+import java.util.Dictionary;
+import java.util.Hashtable;
+
+import org.cishell.framework.CIShellContext;
+import org.cishell.framework.algorithm.Algorithm;
+import org.cishell.framework.algorithm.AlgorithmFactory;
+import org.cishell.framework.algorithm.AlgorithmProperty;
+import org.cishell.framework.data.Data;
+import org.cishell.service.conversion.Converter;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.metatype.MetaTypeProvider;
+
+/**
+ *
+ * @author Bruce Herr (bh...@bh...)
+ */
+public class NullConverter implements Converter, AlgorithmFactory, AlgorithmProperty, Comparable {
+ private Dictionary props;
+
+
+ public NullConverter(String inData) {
+ props = new Hashtable();
+
+ props.put(IN_DATA, inData);
+ props.put(OUT_DATA, inData);
+ props.put(LABEL, props.get(IN_DATA) + " -> " + props.get(OUT_DATA));
+
+ String lossiness = LOSSLESS;
+
+ //TODO: Do the same thing for complexity
+ props.put(CONVERSION, lossiness);
+ }
+
+ /**
+ * @see org.cishell.service.conversion.Converter#convert(org.cishell.framework.data.Data)
+ */
+ public Data convert(Data inDM) {
+ return inDM;
+ }
+
+
+ /**
+ * @see org.cishell.service.conversion.Converter#getAlgorithmFactory()
+ */
+ public AlgorithmFactory getAlgorithmFactory() {
+ return this;
+ }
+
+ /**
+ * @see org.cishell.service.conversion.Converter#getConverterChain()
+ */
+ public ServiceReference[] getConverterChain() {
+ return new ServiceReference[0];
+ }
+
+ /**
+ * @see org.cishell.service.conversion.Converter#getProperties()
+ */
+ public Dictionary getProperties() {
+ return props;
+ }
+
+ public Algorithm createAlgorithm(Data[] dm, Dictionary parameters, CIShellContext context) {
+ return new ConverterAlgorithm(dm, parameters, context);
+ }
+
+ public MetaTypeProvider createParameters(Data[] dm) {
+ return null;
+ }
+
+ public boolean equals(Object o) {
+ boolean equals = false;
+ if (o instanceof Converter) {
+ ServiceReference[] otherServiceReference = ((Converter)o).getConverterChain();
+ if (otherServiceReference.length == 0) {
+ Dictionary otherDictionary = ((Converter)o).getProperties();
+ if (otherDictionary.get(IN_DATA).equals(props.get(IN_DATA)) &&
+ otherDictionary.get(OUT_DATA).equals(props.get(OUT_DATA))) {
+ equals = true;
+ }
+ }
+ }
+
+ return equals;
+ }
+
+ private class ConverterAlgorithm implements Algorithm {
+ Data[] inDM;
+ CIShellContext context;
+ Dictionary parameters;
+
+ public ConverterAlgorithm(Data[] dm, Dictionary parameters, CIShellContext context) {
+ this.inDM = dm;
+ this.parameters = parameters;
+ this.context = context;
+ }
+
+ public Data[] execute() {
+ return inDM;
+ }
+ }
+
+ public int compareTo(Object o) {
+ return equals(o) ? 0 : 1;
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Bruce H. <bh...@bh...> - 2006-10-14 16:02:09
|
hmm... that may work IF we have an edge going from each node to itself and we fill it w/ the null converter (converter that takes the input and returns it as the output) Bruce On 10/14/06, bea...@us... <bea...@us...> wrote: > > Revision: 279 > http://svn.sourceforge.net/cishell/?rev=279&view=rev > Author: bearsfan > Date: 2006-10-14 08:53:43 -0700 (Sat, 14 Oct 2006) > > Log Message: > ----------- > Added check in 'getConverter' method, if the inType==outType then return a > 'null' converter. > > Modified Paths: > -------------- > > trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java > > 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 2006-10-13 > 23:23:12 UTC (rev 278) > +++ > trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java 2006-10-14 > 15:53:43 UTC (rev 279) > @@ -230,6 +230,10 @@ > Vertex srcVertex = (Vertex)dataTypeToVertex.get(inType); > Vertex tgtVertex = (Vertex)dataTypeToVertex.get(outType); > > + if (srcVertex.equals(tgtVertex)) { > + return new ConverterImpl(bContext, ciContext, new > ServiceReference[0]); > + } > + > if (srcVertex != null && tgtVertex != null) { > DijkstraShortestPath shortestPathAlg = new > DijkstraShortestPath(graph); > List edgeList = shortestPathAlg.getPath(srcVertex, > tgtVertex); > > > This was sent by the SourceForge.net collaborative development platform, > the world's largest Open Source development site. > > ------------------------------------------------------------------------- > Using Tomcat but need to do more? Need to support web services, security? > Get stuff done quickly with pre-integrated technology to make your job > easier > Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo > http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 > _______________________________________________ > Cishell-svn mailing list > Cis...@li... > https://lists.sourceforge.net/lists/listinfo/cishell-svn > |
|
From: <bea...@us...> - 2006-10-14 15:53:50
|
Revision: 279
http://svn.sourceforge.net/cishell/?rev=279&view=rev
Author: bearsfan
Date: 2006-10-14 08:53:43 -0700 (Sat, 14 Oct 2006)
Log Message:
-----------
Added check in 'getConverter' method, if the inType==outType then return a 'null' converter.
Modified Paths:
--------------
trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java
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 2006-10-13 23:23:12 UTC (rev 278)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java 2006-10-14 15:53:43 UTC (rev 279)
@@ -230,6 +230,10 @@
Vertex srcVertex = (Vertex)dataTypeToVertex.get(inType);
Vertex tgtVertex = (Vertex)dataTypeToVertex.get(outType);
+ if (srcVertex.equals(tgtVertex)) {
+ return new ConverterImpl(bContext, ciContext, new ServiceReference[0]);
+ }
+
if (srcVertex != null && tgtVertex != null) {
DijkstraShortestPath shortestPathAlg = new DijkstraShortestPath(graph);
List edgeList = shortestPathAlg.getPath(srcVertex, tgtVertex);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
