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-27 19:55:03
|
Revision: 327
http://svn.sourceforge.net/cishell/?rev=327&view=rev
Author: bh2
Date: 2006-10-27 12:54:39 -0700 (Fri, 27 Oct 2006)
Log Message:
-----------
Version bump to v0.2.1
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.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/cishell.product
trunk/deployment/cishell-installer/install.xml
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
trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF
trunk/templates/org.cishell.templates.wizards/META-INF/MANIFEST.MF
Added Paths:
-----------
trunk/deployment/cishell-installer/cishell_linux/plugins/org.eclipse.update.core.linux_3.2.0.v20060605.jar
trunk/deployment/cishell-installer/sampledata/
trunk/deployment/cishell-installer/sampledata/Network/
trunk/deployment/cishell-installer/sampledata/Network/conversionGraph.graphml.xml
trunk/deployment/cishell-installer/sampledata/Network/friendster.graphml.xml
trunk/deployment/cishell-installer/sampledata/Network/friendster.xgmml.xml
trunk/deployment/cishell-installer/sampledata/Network/terror.graphml.xml
trunk/deployment/cishell-installer/sampledata/Network/terror.xgmml.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-26 21:30:52 UTC (rev 326)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/META-INF/MANIFEST.MF 2006-10-27 19:54:39 UTC (rev 327)
@@ -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.2.0
+Bundle-Version: 0.2.1
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-26 21:30:52 UTC (rev 326)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/META-INF/MANIFEST.MF 2006-10-27 19:54:39 UTC (rev 327)
@@ -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.2.0
+Bundle-Version: 0.2.1
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-26 21:30:52 UTC (rev 326)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/META-INF/MANIFEST.MF 2006-10-27 19:54:39 UTC (rev 327)
@@ -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.2.0
+Bundle-Version: 0.2.1
Bundle-Localization: plugin
Import-Package: org.cishell.framework,
org.cishell.service.guibuilder,
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-26 21:30:52 UTC (rev 326)
+++ trunk/clients/gui/org.cishell.reference.gui.log/META-INF/MANIFEST.MF 2006-10-27 19:54:39 UTC (rev 327)
@@ -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.2.0
+Bundle-Version: 0.2.1
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-26 21:30:52 UTC (rev 326)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/META-INF/MANIFEST.MF 2006-10-27 19:54:39 UTC (rev 327)
@@ -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.2.0
+Bundle-Version: 0.2.1
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-26 21:30:52 UTC (rev 326)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/META-INF/MANIFEST.MF 2006-10-27 19:54:39 UTC (rev 327)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Persistence Plug-in
Bundle-SymbolicName: org.cishell.reference.gui.persistence;singleton:=true
-Bundle-Version: 0.2.0
+Bundle-Version: 0.2.1
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-26 21:30:52 UTC (rev 326)
+++ trunk/clients/gui/org.cishell.reference.gui.workspace/META-INF/MANIFEST.MF 2006-10-27 19:54:39 UTC (rev 327)
@@ -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.2.0
+Bundle-Version: 0.2.1
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-26 21:30:52 UTC (rev 326)
+++ trunk/core/org.cishell.framework/META-INF/MANIFEST.MF 2006-10-27 19:54:39 UTC (rev 327)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CIShell Framework API
Bundle-SymbolicName: org.cishell.framework
-Bundle-Version: 0.2.0
+Bundle-Version: 0.2.1
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-26 21:30:52 UTC (rev 326)
+++ trunk/core/org.cishell.reference/META-INF/MANIFEST.MF 2006-10-27 19:54:39 UTC (rev 327)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CIShell Reference Service Implementations
Bundle-SymbolicName: org.cishell.reference
-Bundle-Version: 0.2.0
+Bundle-Version: 0.2.1
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-26 21:30:52 UTC (rev 326)
+++ trunk/core/org.cishell.reference.services/META-INF/MANIFEST.MF 2006-10-27 19:54:39 UTC (rev 327)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Reference Services Starter
Bundle-SymbolicName: org.cishell.reference.services
-Bundle-Version: 0.2.0
+Bundle-Version: 0.2.1
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-26 21:30:52 UTC (rev 326)
+++ trunk/core/org.cishell.service.autostart/META-INF/MANIFEST.MF 2006-10-27 19:54:39 UTC (rev 327)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CIShell Bundler Autostarter
Bundle-SymbolicName: org.cishell.service.autostart
-Bundle-Version: 0.2.0
+Bundle-Version: 0.2.1
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-26 21:30:52 UTC (rev 326)
+++ trunk/deployment/cishell-installer/build.xml 2006-10-27 19:54:39 UTC (rev 327)
@@ -12,7 +12,7 @@
<project name='CIShell Installer' default='compile' basedir='.'>
<!-- Properties -->
- <property name="version" value="0.2.0"/>
+ <property name="version" value="0.2.1"/>
<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/cishell.product
===================================================================
--- trunk/deployment/cishell-installer/cishell.product 2006-10-26 21:30:52 UTC (rev 326)
+++ trunk/deployment/cishell-installer/cishell.product 2006-10-27 19:54:39 UTC (rev 327)
@@ -40,11 +40,11 @@
</plugins>
<features>
- <feature id="org.cishell.algorithm.examples.feature" version="0.2.0.qualifier"/>
+ <feature id="org.cishell.algorithm.examples.feature" version="0.2.1"/>
<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.2.0.qualifier"/>
- <feature id="org.cishell.reference.gui.feature" version="0.2.0.qualifier"/>
+ <feature id="org.cishell.feature" version="0.2.1"/>
+ <feature id="org.cishell.reference.feature" version="0.2.1"/>
+ <feature id="org.cishell.reference.gui.feature" version="0.2.1"/>
</features>
</product>
Added: trunk/deployment/cishell-installer/cishell_linux/plugins/org.eclipse.update.core.linux_3.2.0.v20060605.jar
===================================================================
(Binary files differ)
Property changes on: trunk/deployment/cishell-installer/cishell_linux/plugins/org.eclipse.update.core.linux_3.2.0.v20060605.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/deployment/cishell-installer/install.xml
===================================================================
--- trunk/deployment/cishell-installer/install.xml 2006-10-26 21:30:52 UTC (rev 326)
+++ trunk/deployment/cishell-installer/install.xml 2006-10-27 19:54:39 UTC (rev 327)
@@ -16,7 +16,7 @@
<info>
<appname>CIShell: Cyberinfrastructure Shell</appname>
<appsubpath>cishell</appsubpath>
- <appversion>0.2.0</appversion>
+ <appversion>0.2.1</appversion>
<authors>
<author name="Bruce Herr" email="bh...@bh..." />
<author name="Weixia Huang" email="hu...@in..." />
Added: trunk/deployment/cishell-installer/sampledata/Network/conversionGraph.graphml.xml
===================================================================
--- trunk/deployment/cishell-installer/sampledata/Network/conversionGraph.graphml.xml (rev 0)
+++ trunk/deployment/cishell-installer/sampledata/Network/conversionGraph.graphml.xml 2006-10-27 19:54:39 UTC (rev 327)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns/graphml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns/graphml">
+<graph edgedefault="directed" >
+<node id="1" label="file:text/xgmml+xml" />
+<node id="2" label="prefuse.data.Graph" />
+<node id="3" label="file:application/pajek" />
+<node id="4" label="edu.uci.ics.jung.graph.Graph" />
+<node id="5" label="edu.berkeley.guir.prefuse.graph.Graph" />
+<node id="6" label="file:text/graphml+xml" />
+<edge source="4" target="6" directed="true"/>
+<edge source="3" target="4" directed="true"/>
+<edge source="2" target="6" directed="true"/>
+<edge source="5" target="1" directed="true"/>
+<edge source="4" target="3" directed="true"/>
+<edge source="4" target="5" directed="true"/>
+<edge source="6" target="4" directed="true"/>
+<edge source="1" target="5" directed="true"/>
+<edge source="6" target="2" directed="true"/>
+</graph>
+</graphml>
Added: trunk/deployment/cishell-installer/sampledata/Network/friendster.graphml.xml
===================================================================
--- trunk/deployment/cishell-installer/sampledata/Network/friendster.graphml.xml (rev 0)
+++ trunk/deployment/cishell-installer/sampledata/Network/friendster.graphml.xml 2006-10-27 19:54:39 UTC (rev 327)
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns/graphml"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns/graphml">
+<graph edgedefault="undirected">
+<!-- me -->
+<node id="1" label="Jeff"></node>
+<!-- my friends -->
+<node id="2" label="Ed"></node>
+<node id="3" label="Christiaan"></node>
+<node id="4" label="Emily"></node>
+<node id="5" label="Adam"></node>
+<node id="6" label="Cynthia"></node>
+<node id="7" label="Joylette"></node>
+<node id="8" label="Amanda"></node>
+<node id="9" label="Nathaniel"></node>
+<node id="10" label="Bryan"></node>
+<node id="11" label="Tamara"></node>
+<node id="12" label="Ashley"></node>
+<node id="13" label="Ryan"></node>
+<node id="14" label="Alan"></node>
+<node id="15" label="Chris"></node>
+<node id="16" label="Holly"></node>
+<node id="17" label="Patrick"></node><!-- baudisch -->
+<node id="18" label="Fernando"></node>
+<node id="19" label="Corey"></node>
+<node id="20" label="Ben"></node>
+<node id="21" label="Non"></node>
+<!-- friends of friends -->
+<node id="22" label="John"></node>
+<node id="23" label="Calvin"></node>
+<node id="24" label="Stephanie"></node>
+<node id="25" label="John"></node>
+<node id="26" label="Parker"></node>
+<node id="27" label="Patrick"></node><!-- em's friend -->
+<node id="28" label="Marian"></node>
+<node id="29" label="Robert"></node><!-- amanda's friend -->
+<node id="30" label="Patrick"></node><!-- amanda's friend -->
+<node id="31" label="Sam"></node>
+<node id="32" label="Bob"></node>
+<node id="33" label="Katie"></node>
+<node id="34" label="Chako"></node>
+<!-- through alan -->
+<node id="35" label="Diana"></node>
+<node id="36" label="Record Camp"></node>
+<node id="37" label="Chuck"></node>
+<node id="38" label="Micah"></node>
+<node id="39" label="SuperGiggleB"></node>
+<node id="40" label="Dan"></node>
+<node id="41" label="Ida"></node>
+<node id="42" label="Wen-Ting"></node>
+<node id="43" label="Nina"></node>
+<node id="44" label="Rion"></node>
+<node id="45" label="Otomi"></node>
+<node id="46" label="Ed"></node>
+<node id="47" label="Red"></node>
+<!-- through chris -->
+<node id="48" label="Scott"></node>
+<node id="49" label="Andrew"></node>
+<node id="50" label="Emily"></node>
+<node id="51" label="Robin"></node>
+<node id="52" label="Ken"></node>
+<node id="53" label="Michael"></node>
+<node id="54" label="Jon"></node>
+<node id="55" label="Josh"></node>
+<node id="56" label="Matthew"></node>
+<node id="57" label="Casey"></node>
+<node id="58" label="Christopher"></node>
+<node id="59" label="Stephen"></node>
+<node id="60" label="Kenji"></node>
+<node id="61" label="Richard"></node>
+<node id="62" label="Matthew"></node>
+<node id="63" label="David"></node>
+<node id="64" label="Phil"></node>
+<node id="65" label="David"></node>
+<!-- through holly -->
+<node id="66" label="Pete"></node>
+<node id="67" label="Jeremy"></node>
+<!-- through patrick (baudisch) -->
+<node id="68" label="Daniel"></node>
+<node id="69" label="Sumit"></node>
+<!-- through fernando -->
+<node id="70" label="Shane"></node>
+<node id="71" label="Rikard"></node>
+<node id="72" label="David"></node>
+<node id="73" label="Justin"></node>
+<node id="74" label="Shane"></node>
+<node id="75" label="Micaela"></node>
+<node id="76" label="Steven"></node>
+<node id="77" label="Matt"></node>
+<node id="78" label="Jory"></node>
+<node id="79" label="Alexander"></node>
+<node id="80" label="Jason"></node>
+<node id="81" label="JohnAnthony"></node>
+<!-- through ben -->
+<node id="82" label="Dorothy"></node>
+<node id="83" label="Nels"></node>
+<node id="84" label="Rania"></node>
+<node id="85" label="Michael"></node>
+<node id="86" label="Evan"></node>
+<node id="87" label="Joanna"></node>
+<node id="88" label="sistah"></node>
+<node id="89" label="Meredith"></node>
+<node id="90" label="Eric"></node>
+<node id="91" label="John"></node>
+<node id="92" label="ryan"></node>
+<node id="93" label="Eric"></node>
+<node id="94" label="Jay"></node>
+<node id="95" label="rumi"></node>
+<node id="96" label="justin"></node>
+<node id="97" label="Julij"></node>
+<node id="98" label="beverly"></node>
+<node id="99" label="Jai Young"></node>
+<node id="100" label="spot"></node>
+<node id="101" label="Tammy"></node>
+<node id="102" label="Michael"></node>
+<node id="103" label="jennifer"></node>
+<node id="104" label="Brent"></node>
+<node id="105" label="Lanha souris"></node>
+<node id="106" label="dan"></node>
+<node id="107" label="jeremy"></node>
+<node id="108" label="Jim"></node>
+<node id="109" label="steph"></node>
+<node id="110" label="Jane"></node>
+<node id="111" label="Justin"></node>
+<node id="112" label="Kevin"></node>
+<node id="113" label="Matt"></node>
+<node id="114" label="Judith"></node>
+<node id="115" label="Alexander"></node>
+<node id="116" label="Caterina"></node>
+<node id="117" label="Jesse James"></node>
+<node id="118" label="Tom"></node>
+<node id="119" label="Stewart"></node>
+<node id="120" label="Meg"></node>
+<node id="121" label="Matt"></node>
+<node id="122" label="Anil"></node>
+<!-- through non -->
+<node id="123" label="Scott"></node>
+<node id="124" label="Steve"></node>
+<node id="125" label="kris"></node>
+<node id="126" label="Bill"></node>
+<node id="127" label="Xz"></node>
+<node id="128" label="David"></node>
+<node id="129" label="Zephoria"></node>
+
+<!-- edges -->
+<edge label="" source="1" target="2"></edge>
+<edge label="" source="1" target="3"></edge>
+<edge label="" source="1" target="4"></edge>
+<edge label="" source="1" target="5"></edge>
+<edge label="" source="1" target="6"></edge>
+<edge label="" source="1" target="7"></edge>
+<edge label="" source="1" target="8"></edge>
+<edge label="" source="1" target="9"></edge>
+<edge label="" source="1" target="10"></edge>
+<edge label="" source="1" target="11"></edge>
+<edge label="" source="1" target="12"></edge>
+<edge label="" source="1" target="13"></edge>
+<edge label="" source="1" target="14"></edge>
+<edge label="" source="1" target="15"></edge>
+<edge label="" source="1" target="16"></edge>
+<edge label="" source="1" target="17"></edge>
+<edge label="" source="1" target="18"></edge>
+<edge label="" source="1" target="19"></edge>
+<edge label="" source="1" target="20"></edge>
+<edge label="" source="1" target="21"></edge>
+<!-- ed's friends -->
+<edge label="" source="2" target="5"></edge>
+<edge label="" source="2" target="8"></edge>
+<edge label="" source="2" target="10"></edge>
+<!-- christiaan's friends -->
+<edge label="" source="3" target="5"></edge>
+<edge label="" source="3" target="8"></edge>
+<edge label="" source="3" target="10"></edge>
+<edge label="" source="3" target="17"></edge>
+<!-- emily's friends -->
+<edge label="" source="4" target="22"></edge>
+<edge label="" source="4" target="23"></edge>
+<edge label="" source="4" target="24"></edge>
+<edge label="" source="4" target="25"></edge>
+<edge label="" source="4" target="26"></edge>
+<edge label="" source="4" target="27"></edge>
+<!-- adam's friends -->
+<edge label="" source="5" target="8"></edge>
+<edge label="" source="5" target="10"></edge>
+<!-- cynthia's friends -->
+<edge label="" source="6" target="14"></edge>
+<!-- joylette's friends -->
+<edge label="" source="7" target="8"></edge>
+<edge label="" source="7" target="10"></edge>
+<edge label="" source="7" target="28"></edge>
+<!-- amanda's friends -->
+<edge label="" source="8" target="10"></edge>
+<edge label="" source="8" target="14"></edge>
+<edge label="" source="8" target="15"></edge>
+<edge label="" source="8" target="29"></edge>
+<edge label="" source="8" target="17"></edge>
+<edge label="" source="8" target="18"></edge>
+<edge label="" source="8" target="30"></edge>
+<edge label="" source="8" target="21"></edge>
+<!-- nathaniel's friends -->
+<!-- bryan's friends -->
+<edge label="" source="10" target="31"></edge>
+<edge label="" source="10" target="17"></edge>
+<edge label="" source="10" target="30"></edge>
+<!-- tamara's friends -->
+<edge label="" source="11" target="12"></edge>
+<edge label="" source="11" target="32"></edge>
+<edge label="" source="11" target="33"></edge>
+<!-- ashley's friends -->
+<!-- ryan's friends -->
+<edge label="" source="13" target="34"></edge>
+<edge label="" source="13" target="19"></edge>
+<!-- alan's friends -->
+<edge label="" source="14" target="35"></edge>
+<edge label="" source="14" target="36"></edge>
+<edge label="" source="14" target="37"></edge>
+<edge label="" source="14" target="38"></edge>
+<edge label="" source="14" target="39"></edge>
+<edge label="" source="14" target="40"></edge>
+<edge label="" source="14" target="41"></edge>
+<edge label="" source="14" target="42"></edge>
+<edge label="" source="14" target="43"></edge>
+<edge label="" source="14" target="44"></edge>
+<edge label="" source="14" target="45"></edge>
+<edge label="" source="14" target="46"></edge>
+<edge label="" source="14" target="47"></edge>
+<edge label="" source="14" target="15"></edge>
+<edge label="" source="14" target="18"></edge>
+<edge label="" source="14" target="21"></edge>
+<!-- chris's friends -->
+<edge label="" source="15" target="48"></edge>
+<edge label="" source="15" target="49"></edge>
+<edge label="" source="15" target="50"></edge>
+<edge label="" source="15" target="51"></edge>
+<edge label="" source="15" target="52"></edge>
+<edge label="" source="15" target="53"></edge>
+<edge label="" source="15" target="54"></edge>
+<edge label="" source="15" target="55"></edge>
+<edge label="" source="15" target="56"></edge>
+<edge label="" source="15" target="57"></edge>
+<edge label="" source="15" target="58"></edge>
+<edge label="" source="15" target="59"></edge>
+<edge label="" source="15" target="60"></edge>
+<edge label="" source="15" target="61"></edge>
+<edge label="" source="15" target="62"></edge>
+<edge label="" source="15" target="63"></edge>
+<edge label="" source="15" target="64"></edge>
+<edge label="" source="15" target="65"></edge>
+<edge label="" source="15" target="16"></edge>
+<edge label="" source="15" target="18"></edge>
+<edge label="" source="15" target="21"></edge>
+<!-- holly's friends -->
+<edge label="" source="16" target="66"></edge>
+<edge label="" source="16" target="59"></edge>
+<edge label="" source="16" target="60"></edge>
+<edge label="" source="16" target="67"></edge>
+<!-- patrick's friends -->
+<edge label="" source="17" target="68"></edge>
+<edge label="" source="17" target="69"></edge>
+<!-- fernando's friends -->
+<edge label="" source="18" target="70"></edge>
+<edge label="" source="18" target="71"></edge>
+<edge label="" source="18" target="72"></edge>
+<edge label="" source="18" target="73"></edge>
+<edge label="" source="18" target="74"></edge>
+<edge label="" source="18" target="75"></edge>
+<edge label="" source="18" target="76"></edge>
+<edge label="" source="18" target="77"></edge>
+<edge label="" source="18" target="78"></edge>
+<edge label="" source="18" target="79"></edge>
+<edge label="" source="18" target="80"></edge>
+<edge label="" source="18" target="81"></edge>
+<!-- corey's friends -->
+<edge label="" source="19" target="20"></edge>
+<!-- ben's friends -->
+<edge label="" source="20" target="45"></edge>
+<edge label="" source="20" target="46"></edge>
+<edge label="" source="20" target="82"></edge>
+<edge label="" source="20" target="83"></edge>
+<edge label="" source="20" target="84"></edge>
+<edge label="" source="20" target="85"></edge>
+<edge label="" source="20" target="86"></edge>
+<edge label="" source="20" target="87"></edge>
+<edge label="" source="20" target="88"></edge>
+<edge label="" source="20" target="89"></edge>
+<edge label="" source="20" target="90"></edge>
+<edge label="" source="20" target="91"></edge>
+<edge label="" source="20" target="92"></edge>
+<edge label="" source="20" target="93"></edge>
+<edge label="" source="20" target="94"></edge>
+<edge label="" source="20" target="95"></edge>
+<edge label="" source="20" target="96"></edge>
+<edge label="" source="20" target="97"></edge>
+<edge label="" source="20" target="98"></edge>
+<edge label="" source="20" target="99"></edge>
+<edge label="" source="20" target="100"></edge>
+<edge label="" source="20" target="101"></edge>
+<edge label="" source="20" target="102"></edge>
+<edge label="" source="20" target="103"></edge>
+<edge label="" source="20" target="104"></edge>
+<edge label="" source="20" target="105"></edge>
+<edge label="" source="20" target="106"></edge>
+<edge label="" source="20" target="107"></edge>
+<edge label="" source="20" target="108"></edge>
+<edge label="" source="20" target="109"></edge>
+<edge label="" source="20" target="110"></edge>
+<edge label="" source="20" target="111"></edge>
+<edge label="" source="20" target="112"></edge>
+<edge label="" source="20" target="113"></edge>
+<edge label="" source="20" target="114"></edge>
+<edge label="" source="20" target="115"></edge>
+<edge label="" source="20" target="116"></edge>
+<edge label="" source="20" target="117"></edge>
+<edge label="" source="20" target="118"></edge>
+<edge label="" source="20" target="119"></edge>
+<edge label="" source="20" target="120"></edge>
+<edge label="" source="20" target="121"></edge>
+<edge label="" source="20" target="122"></edge>
+<!-- non's friends -->
+<edge label="" source="21" target="123"></edge>
+<edge label="" source="21" target="124"></edge>
+<edge label="" source="21" target="125"></edge>
+<edge label="" source="21" target="126"></edge>
+<edge label="" source="21" target="127"></edge>
+<edge label="" source="21" target="128"></edge>
+<edge label="" source="21" target="129"></edge>
+
+</graph>
+</graphml>
+
Added: trunk/deployment/cishell-installer/sampledata/Network/friendster.xgmml.xml
===================================================================
--- trunk/deployment/cishell-installer/sampledata/Network/friendster.xgmml.xml (rev 0)
+++ trunk/deployment/cishell-installer/sampledata/Network/friendster.xgmml.xml 2006-10-27 19:54:39 UTC (rev 327)
@@ -0,0 +1,325 @@
+<graph directed="0">
+<!-- me -->
+<node id="1" label="Jeff"></node>
+<!-- my friends -->
+<node id="2" label="Ed"></node>
+<node id="3" label="Christiaan"></node>
+<node id="4" label="Emily"></node>
+<node id="5" label="Adam"></node>
+<node id="6" label="Cynthia"></node>
+<node id="7" label="Joylette"></node>
+<node id="8" label="Amanda"></node>
+<node id="9" label="Nathaniel"></node>
+<node id="10" label="Bryan"></node>
+<node id="11" label="Tamara"></node>
+<node id="12" label="Ashley"></node>
+<node id="13" label="Ryan"></node>
+<node id="14" label="Alan"></node>
+<node id="15" label="Chris"></node>
+<node id="16" label="Holly"></node>
+<node id="17" label="Patrick"></node><!-- baudisch -->
+<node id="18" label="Fernando"></node>
+<node id="19" label="Corey"></node>
+<node id="20" label="Ben"></node>
+<node id="21" label="Non"></node>
+<!-- friends of friends -->
+<node id="22" label="John"></node>
+<node id="23" label="Calvin"></node>
+<node id="24" label="Stephanie"></node>
+<node id="25" label="John"></node>
+<node id="26" label="Parker"></node>
+<node id="27" label="Patrick"></node><!-- em's friend -->
+<node id="28" label="Marian"></node>
+<node id="29" label="Robert"></node><!-- amanda's friend -->
+<node id="30" label="Patrick"></node><!-- amanda's friend -->
+<node id="31" label="Sam"></node>
+<node id="32" label="Bob"></node>
+<node id="33" label="Katie"></node>
+<node id="34" label="Chako"></node>
+<!-- through alan -->
+<node id="35" label="Diana"></node>
+<node id="36" label="Record Camp"></node>
+<node id="37" label="Chuck"></node>
+<node id="38" label="Micah"></node>
+<node id="39" label="SuperGiggleB"></node>
+<node id="40" label="Dan"></node>
+<node id="41" label="Ida"></node>
+<node id="42" label="Wen-Ting"></node>
+<node id="43" label="Nina"></node>
+<node id="44" label="Rion"></node>
+<node id="45" label="Otomi"></node>
+<node id="46" label="Ed"></node>
+<node id="47" label="Red"></node>
+<!-- through chris -->
+<node id="48" label="Scott"></node>
+<node id="49" label="Andrew"></node>
+<node id="50" label="Emily"></node>
+<node id="51" label="Robin"></node>
+<node id="52" label="Ken"></node>
+<node id="53" label="Michael"></node>
+<node id="54" label="Jon"></node>
+<node id="55" label="Josh"></node>
+<node id="56" label="Matthew"></node>
+<node id="57" label="Casey"></node>
+<node id="58" label="Christopher"></node>
+<node id="59" label="Stephen"></node>
+<node id="60" label="Kenji"></node>
+<node id="61" label="Richard"></node>
+<node id="62" label="Matthew"></node>
+<node id="63" label="David"></node>
+<node id="64" label="Phil"></node>
+<node id="65" label="David"></node>
+<!-- through holly -->
+<node id="66" label="Pete"></node>
+<node id="67" label="Jeremy"></node>
+<!-- through patrick (baudisch) -->
+<node id="68" label="Daniel"></node>
+<node id="69" label="Sumit"></node>
+<!-- through fernando -->
+<node id="70" label="Shane"></node>
+<node id="71" label="Rikard"></node>
+<node id="72" label="David"></node>
+<node id="73" label="Justin"></node>
+<node id="74" label="Shane"></node>
+<node id="75" label="Micaela"></node>
+<node id="76" label="Steven"></node>
+<node id="77" label="Matt"></node>
+<node id="78" label="Jory"></node>
+<node id="79" label="Alexander"></node>
+<node id="80" label="Jason"></node>
+<node id="81" label="JohnAnthony"></node>
+<!-- through ben -->
+<node id="82" label="Dorothy"></node>
+<node id="83" label="Nels"></node>
+<node id="84" label="Rania"></node>
+<node id="85" label="Michael"></node>
+<node id="86" label="Evan"></node>
+<node id="87" label="Joanna"></node>
+<node id="88" label="sistah"></node>
+<node id="89" label="Meredith"></node>
+<node id="90" label="Eric"></node>
+<node id="91" label="John"></node>
+<node id="92" label="ryan"></node>
+<node id="93" label="Eric"></node>
+<node id="94" label="Jay"></node>
+<node id="95" label="rumi"></node>
+<node id="96" label="justin"></node>
+<node id="97" label="Julij"></node>
+<node id="98" label="beverly"></node>
+<node id="99" label="Jai Young"></node>
+<node id="100" label="spot"></node>
+<node id="101" label="Tammy"></node>
+<node id="102" label="Michael"></node>
+<node id="103" label="jennifer"></node>
+<node id="104" label="Brent"></node>
+<node id="105" label="Lanha souris"></node>
+<node id="106" label="dan"></node>
+<node id="107" label="jeremy"></node>
+<node id="108" label="Jim"></node>
+<node id="109" label="steph"></node>
+<node id="110" label="Jane"></node>
+<node id="111" label="Justin"></node>
+<node id="112" label="Kevin"></node>
+<node id="113" label="Matt"></node>
+<node id="114" label="Judith"></node>
+<node id="115" label="Alexander"></node>
+<node id="116" label="Caterina"></node>
+<node id="117" label="Jesse James"></node>
+<node id="118" label="Tom"></node>
+<node id="119" label="Stewart"></node>
+<node id="120" label="Meg"></node>
+<node id="121" label="Matt"></node>
+<node id="122" label="Anil"></node>
+<!-- through non -->
+<node id="123" label="Scott"></node>
+<node id="124" label="Steve"></node>
+<node id="125" label="kris"></node>
+<node id="126" label="Bill"></node>
+<node id="127" label="Xz"></node>
+<node id="128" label="David"></node>
+<node id="129" label="Zephoria"></node>
+
+<!-- edges -->
+<edge label="" source="1" target="2"></edge>
+<edge label="" source="1" target="3"></edge>
+<edge label="" source="1" target="4"></edge>
+<edge label="" source="1" target="5"></edge>
+<edge label="" source="1" target="6"></edge>
+<edge label="" source="1" target="7"></edge>
+<edge label="" source="1" target="8"></edge>
+<edge label="" source="1" target="9"></edge>
+<edge label="" source="1" target="10"></edge>
+<edge label="" source="1" target="11"></edge>
+<edge label="" source="1" target="12"></edge>
+<edge label="" source="1" target="13"></edge>
+<edge label="" source="1" target="14"></edge>
+<edge label="" source="1" target="15"></edge>
+<edge label="" source="1" target="16"></edge>
+<edge label="" source="1" target="17"></edge>
+<edge label="" source="1" target="18"></edge>
+<edge label="" source="1" target="19"></edge>
+<edge label="" source="1" target="20"></edge>
+<edge label="" source="1" target="21"></edge>
+<!-- ed's friends -->
+<edge label="" source="2" target="5"></edge>
+<edge label="" source="2" target="8"></edge>
+<edge label="" source="2" target="10"></edge>
+<!-- christiaan's friends -->
+<edge label="" source="3" target="5"></edge>
+<edge label="" source="3" target="8"></edge>
+<edge label="" source="3" target="10"></edge>
+<edge label="" source="3" target="17"></edge>
+<!-- emily's friends -->
+<edge label="" source="4" target="22"></edge>
+<edge label="" source="4" target="23"></edge>
+<edge label="" source="4" target="24"></edge>
+<edge label="" source="4" target="25"></edge>
+<edge label="" source="4" target="26"></edge>
+<edge label="" source="4" target="27"></edge>
+<!-- adam's friends -->
+<edge label="" source="5" target="8"></edge>
+<edge label="" source="5" target="10"></edge>
+<!-- cynthia's friends -->
+<edge label="" source="6" target="14"></edge>
+<!-- joylette's friends -->
+<edge label="" source="7" target="8"></edge>
+<edge label="" source="7" target="10"></edge>
+<edge label="" source="7" target="28"></edge>
+<!-- amanda's friends -->
+<edge label="" source="8" target="10"></edge>
+<edge label="" source="8" target="14"></edge>
+<edge label="" source="8" target="15"></edge>
+<edge label="" source="8" target="29"></edge>
+<edge label="" source="8" target="17"></edge>
+<edge label="" source="8" target="18"></edge>
+<edge label="" source="8" target="30"></edge>
+<edge label="" source="8" target="21"></edge>
+<!-- nathaniel's friends -->
+<!-- bryan's friends -->
+<edge label="" source="10" target="31"></edge>
+<edge label="" source="10" target="17"></edge>
+<edge label="" source="10" target="30"></edge>
+<!-- tamara's friends -->
+<edge label="" source="11" target="12"></edge>
+<edge label="" source="11" target="32"></edge>
+<edge label="" source="11" target="33"></edge>
+<!-- ashley's friends -->
+<!-- ryan's friends -->
+<edge label="" source="13" target="34"></edge>
+<edge label="" source="13" target="19"></edge>
+<!-- alan's friends -->
+<edge label="" source="14" target="35"></edge>
+<edge label="" source="14" target="36"></edge>
+<edge label="" source="14" target="37"></edge>
+<edge label="" source="14" target="38"></edge>
+<edge label="" source="14" target="39"></edge>
+<edge label="" source="14" target="40"></edge>
+<edge label="" source="14" target="41"></edge>
+<edge label="" source="14" target="42"></edge>
+<edge label="" source="14" target="43"></edge>
+<edge label="" source="14" target="44"></edge>
+<edge label="" source="14" target="45"></edge>
+<edge label="" source="14" target="46"></edge>
+<edge label="" source="14" target="47"></edge>
+<edge label="" source="14" target="15"></edge>
+<edge label="" source="14" target="18"></edge>
+<edge label="" source="14" target="21"></edge>
+<!-- chris's friends -->
+<edge label="" source="15" target="48"></edge>
+<edge label="" source="15" target="49"></edge>
+<edge label="" source="15" target="50"></edge>
+<edge label="" source="15" target="51"></edge>
+<edge label="" source="15" target="52"></edge>
+<edge label="" source="15" target="53"></edge>
+<edge label="" source="15" target="54"></edge>
+<edge label="" source="15" target="55"></edge>
+<edge label="" source="15" target="56"></edge>
+<edge label="" source="15" target="57"></edge>
+<edge label="" source="15" target="58"></edge>
+<edge label="" source="15" target="59"></edge>
+<edge label="" source="15" target="60"></edge>
+<edge label="" source="15" target="61"></edge>
+<edge label="" source="15" target="62"></edge>
+<edge label="" source="15" target="63"></edge>
+<edge label="" source="15" target="64"></edge>
+<edge label="" source="15" target="65"></edge>
+<edge label="" source="15" target="16"></edge>
+<edge label="" source="15" target="18"></edge>
+<edge label="" source="15" target="21"></edge>
+<!-- holly's friends -->
+<edge label="" source="16" target="66"></edge>
+<edge label="" source="16" target="59"></edge>
+<edge label="" source="16" target="60"></edge>
+<edge label="" source="16" target="67"></edge>
+<!-- patrick's friends -->
+<edge label="" source="17" target="68"></edge>
+<edge label="" source="17" target="69"></edge>
+<!-- fernando's friends -->
+<edge label="" source="18" target="70"></edge>
+<edge label="" source="18" target="71"></edge>
+<edge label="" source="18" target="72"></edge>
+<edge label="" source="18" target="73"></edge>
+<edge label="" source="18" target="74"></edge>
+<edge label="" source="18" target="75"></edge>
+<edge label="" source="18" target="76"></edge>
+<edge label="" source="18" target="77"></edge>
+<edge label="" source="18" target="78"></edge>
+<edge label="" source="18" target="79"></edge>
+<edge label="" source="18" target="80"></edge>
+<edge label="" source="18" target="81"></edge>
+<!-- corey's friends -->
+<edge label="" source="19" target="20"></edge>
+<!-- ben's friends -->
+<edge label="" source="20" target="45"></edge>
+<edge label="" source="20" target="46"></edge>
+<edge label="" source="20" target="82"></edge>
+<edge label="" source="20" target="83"></edge>
+<edge label="" source="20" target="84"></edge>
+<edge label="" source="20" target="85"></edge>
+<edge label="" source="20" target="86"></edge>
+<edge label="" source="20" target="87"></edge>
+<edge label="" source="20" target="88"></edge>
+<edge label="" source="20" target="89"></edge>
+<edge label="" source="20" target="90"></edge>
+<edge label="" source="20" target="91"></edge>
+<edge label="" source="20" target="92"></edge>
+<edge label="" source="20" target="93"></edge>
+<edge label="" source="20" target="94"></edge>
+<edge label="" source="20" target="95"></edge>
+<edge label="" source="20" target="96"></edge>
+<edge label="" source="20" target="97"></edge>
+<edge label="" source="20" target="98"></edge>
+<edge label="" source="20" target="99"></edge>
+<edge label="" source="20" target="100"></edge>
+<edge label="" source="20" target="101"></edge>
+<edge label="" source="20" target="102"></edge>
+<edge label="" source="20" target="103"></edge>
+<edge label="" source="20" target="104"></edge>
+<edge label="" source="20" target="105"></edge>
+<edge label="" source="20" target="106"></edge>
+<edge label="" source="20" target="107"></edge>
+<edge label="" source="20" target="108"></edge>
+<edge label="" source="20" target="109"></edge>
+<edge label="" source="20" target="110"></edge>
+<edge label="" source="20" target="111"></edge>
+<edge label="" source="20" target="112"></edge>
+<edge label="" source="20" target="113"></edge>
+<edge label="" source="20" target="114"></edge>
+<edge label="" source="20" target="115"></edge>
+<edge label="" source="20" target="116"></edge>
+<edge label="" source="20" target="117"></edge>
+<edge label="" source="20" target="118"></edge>
+<edge label="" source="20" target="119"></edge>
+<edge label="" source="20" target="120"></edge>
+<edge label="" source="20" target="121"></edge>
+<edge label="" source="20" target="122"></edge>
+<!-- non's friends -->
+<edge label="" source="21" target="123"></edge>
+<edge label="" source="21" target="124"></edge>
+<edge label="" source="21" target="125"></edge>
+<edge label="" source="21" target="126"></edge>
+<edge label="" source="21" target="127"></edge>
+<edge label="" source="21" target="128"></edge>
+<edge label="" source="21" target="129"></edge>
+
+</graph>
\ No newline at end of file
Added: trunk/deployment/cishell-installer/sampledata/Network/terror.graphml.xml
===================================================================
--- trunk/deployment/cishell-installer/sampledata/Network/terror.graphml.xml (rev 0)
+++ trunk/deployment/cishell-installer/sampledata/Network/terror.graphml.xml 2006-10-27 19:54:39 UTC (rev 327)
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns/graphml"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns/graphml">
+<graph edgedefault="undirected" >
+<!-- prefuse graph writer :: Sat Aug 09 15:08:49 PDT 2003 -->
+ <!-- nodes -->
+ <node id="al-shehhi" label="Marwan Al-Shehhi">
+ <att name="Y" value="435.0"/>
+ <att name="X" value="229.0"/>
+ <att name="flight" value="United Airlines Flight 175 (WTC2)"/>
+ <att name="pilot" value="true"/>
+</node>
+ <node id="alshehri" label="Waleed M. Alshehri">
+ <att name="Y" value="571.0"/>
+ <att name="X" value="383.0"/>
+ <att name="flight" value="American Airlines Flight 11 (WTC1)"/>
+</node>
+ <node id="halghamdi" label="Hamza Alghamdi">
+ <att name="Y" value="329.0"/>
+ <att name="X" value="300.0"/>
+ <att name="flight" value="United Airlines Flight 175 (WTC2)"/>
+</node>
+ <node id="alsuqami" label="Satam M. A. Al Suqami">
+ <att name="Y" value="443.0"/>
+ <att name="X" value="413.0"/>
+ <att name="flight" value="American Airlines Flight 11 (WTC1)"/>
+</node>
+ <node id="omar" label="Ramzi Omar">
+ <att name="Y" value="435.0"/>
+ <att name="X" value="41.0"/>
+</node>
+ <node id="abdullah" label="Rayed Mohammed Abdullah">
+ <att name="Y" value="67.0"/>
+ <att name="X" value="77.0"/>
+</node>
+<node id="essabar" label="Zakariya Essabar">
+ <att name="Y" value="469.0"/>
+ <att name="X" value="126.0"/>
+</node>
+ <node id="moqed" label="Majed Moqed">
+ <att name="Y" value="12.0"/>
+ <att name="X" value="200.0"/>
+ <att name="flight" value="American Airlines Flight 77 (Pentagon)"/>
+</node>
+ <node id="nalhazmi" label="Nawaf Alhazmi">
+ <att name="Y" value="43.0"/>
+ <att name="X" value="460.0"/>
+ <att name="flight" value="American Airlines Flight 77 (Pentagon)"/>
+</node>
+ <node id="salim" label="Mamduh Mahmud Salim">
+ <att name="Y" value="554.0"/>
+ <att name="X" value="71.0"/>
+</node>
+ <node id="atta" label="Mohamed Atta">
+ <att name="Y" value="393.0"/>
+ <att name="X" value="229.0"/>
+ <att name="flight" value="American Airlines Flight 11 (WTC1)"/>
+ <att name="pilot" value="true"/>
+</node>
+ <node id="moussaoui" label="Habib Zacarias Moussaoui">
+ <att name="Y" value="223.0"/>
+ <att name="X" value="201.0"/>
+</node>
+ <node id="raissi" label="Lotfi Raissi">
+ <att name="Y" value="186.0"/>
+ <att name="X" value="77.0"/>
+</node>
+ <node id="bahaji" label="Said Bahaji">
+ <att name="Y" value="393.0"/>
+ <att name="X" value="41.0"/>
+</node>
+ <node id="al-marabh" label="Nabil al-Marabh">
+ <att name="Y" value="311.0"/>
+ <att name="X" value="475.0"/>
+</node>
+ <node id="salhazmi" label="Salem Alhazmi">
+ <att name="Y" value="116.0"/>
+ <att name="X" value="304.0"/>
+ <att name="flight" value="American Airlines Flight 77 (Pentagon)"/>
+</node>
+ <node id="aalghamdi" label="Ahmed Alghamdi">
+ <att name="Y" value="174.0"/>
+ <att name="X" value="359.0"/>
+ <att name="flight" value="United Airlines Flight 175 (WTC2)"/>
+</node>
+ <node id="abdi" label="Mohamed Abdi">
+ <att name="Y" value="73.0"/>
+ <att name="X" value="544.0"/>
+</node>
+ <node id="saiid" label="Shaykh Saiid">
+ <att name="Y" value="517.0"/>
+ <att name="X" value="287.0"/>
+</node>
+ <node id="alhaznawi" label="Ahmed Ibrahim A. Al Haznawi">
+ <att name="Y" value="254.0"/>
+ <att name="X" value="251.0"/>
+ <att name="flight" value="United Airlines Flight 93 (Pennsylvania)"/>
+</node>
+ <node id="alomari" label="Abdulaziz Alomari">
+ <att name="Y" value="387.0"/>
+ <att name="X" value="352.0"/>
+ <att name="flight" value="American Airlines Flight 11 (WTC1)"/>
+</node>
+ <node id="darkazanli" label="Mamoun Darkazanli">
+ <att name="Y" value="516.0"/>
+ <att name="X" value="174.0"/>
+</node>
+ <node id="alnami" label="Ahmed Alnami">
+ <att name="Y" value="161.0"/>
+ <att name="X" value="460.0"/>
+ <att name="flight" value="United Airlines Flight 93 (Pennsylvania)"/>
+</node>
+ <node id="salghamdi" label="Saeed Alghamdi">
+ <att name="Y" value="211.0"/>
+ <att name="X" value="541.0"/>
+ <att name="flight" value="United Airlines Flight 93 (Pennsylvania)"/>
+</node>
+ <node id="hijazi" label="Raed Hijazi">
+ <att name="Y" value="350.0"/>
+ <att name="X" value="541.0"/>
+</node>
+ <node id="malshehri" label="Mohand Alshehri">
+ <att name="Y" value="438.0"/>
+ <att name="X" value="543.0"/>
+ <att name="flight" value="United Airlines Flight 175 (WTC2)"/>
+</node>
+ <node id="almihdhar" label="Khalid Almihdhar">
+ <att name="Y" value="12.0"/>
+ <att name="X" value="364.0"/>
+ <att name="flight" value="American Airlines Flight 77 (Pentagon)"/>
+</node>
+ <node id="shaikh" label="Abdussattar Shaikh">
+ <att name="Y" value="12.0"/>
+ <att name="X" value="529.0"/>
+</node>
+ <node id="jarrah" label="Ziad Samir Jarrah">
+ <att name="Y" value="362.0"/>
+ <att name="X" value="126.0"/>
+ <att name="flight" value="United Airlines Flight 93 (Pennsylvania)"/>
+ <att name="pilot" value="true"/>
+</node>
+ <node id="walshehri" label="Wail M. Alshehri">
+ <att name="Y" value="501.0"/>
+ <att name="X" value="386.0"/>
+ <att name="flight" value="American Airlines Flight 11 (WTC1)"/>
+</node>
+ <node id="banihammad" label="Fayez Rashid Ahmed Hassan Al Qadi Banihammad">
+ <att name="Y" value="536.0"/>
+ <att name="X" value="553.0"/>
+ <att name="flight" value="United Airlines Flight 175 (WTC2)"/>
+</node>
+ <node id="alsalmi" label="Faisal Al Salmi">
+ <att name="Y" value="15.0"/>
+ <att name="X" value="107.0"/>
+</node>
+ <node id="al-ani" label="Ahmed Khalil Ibrahim Samir Al-Ani">
+ <att name="Y" value="280.0"/>
+ <att name="X" value="129.0"/>
+</node>
+ <node id="hanjour" label="Hani Hanjour">
+ <att name="Y" value="67.0"/>
+ <att name="X" value="200.0"/>
+ <att name="flight" value="American Airlines Flight 77 (Pentagon)"/>
+ <att name="pilot" value="true"/>
+</node>
+
+ <!-- edges -->
+ <edge source="al-shehhi" target="halghamdi" weight="1"></edge>
+ <edge source="al-shehhi" target="raissi" weight="2"></edge>
+ <edge source="al-shehhi" target="essabar" weight="3"></edge>
+ <edge source="al-shehhi" target="atta" weight="3"></edge>
+ <edge source="al-shehhi" target="omar" weight="3"></edge>
+ <edge source="al-shehhi" target="bahaji" weight="3"></edge>
+ <edge source="al-shehhi" target="jarrah" weight="3"></edge>
+ <edge source="al-shehhi" target="darkazanli" weight="2"></edge>
+ <edge source="al-shehhi" target="saiid" weight="1"></edge>
+ <edge source="al-shehhi" target="alshehri" weight="1"></edge>
+ <edge source="al-shehhi" target="walshehri" weight="1"></edge>
+ <edge source="al-shehhi" target="alsuqami" weight="1"></edge>
+ <edge source="alshehri" target="saiid" weight="1"></edge>
+ <edge source="alshehri" target="walshehri" weight="3"></edge>
+ <edge source="alshehri" target="alomari" weight="1"></edge>
+ <edge source="alshehri" target="alsuqami" weight="3"></edge>
+ <edge source="alshehri" target="banihammad" weight="1"></edge>
+ <edge source="halghamdi" target="nalhazmi" weight="2"></edge>
+ <edge source="halghamdi" target="alnami" weight="3"></edge>
+ <edge source="halghamdi" target="salghamdi" weight="2"></edge>
+ <edge source="halghamdi" target="aalghamdi" weight="2"></edge>
+ <edge source="halghamdi" target="alhaznawi" weight="3"></edge>
+ <edge source="halghamdi" target="malshehri" weight="2"></edge>
+ <edge source="alsuqami" target="hijazi" weight="2"></edge>
+ <edge source="alsuqami" target="al-marabh" weight="2"></edge>
+ <edge source="alsuqami" target="banihammad" weight="1"></edge>
+ <edge source="alsuqami" target="walshehri" weight="3"></edge>
+ <edge source="alsuqami" target="alomari" weight="1"></edge>
+ <edge source="alsuqami" target="atta" weight="1"></edge>
+ <edge source="omar" target="bahaji" weight="3"></edge>
+ <edge source="omar" target="essabar" weight="3"></edge>
+ <edge source="omar" target="atta" weight="3"></edge>
+ <edge source="omar" target="jarrah" weight="3"></edge>
+ <edge source="abdullah" target="alsalmi" weight="1"></edge>
+ <edge source="abdullah" target="hanjour" weight="3"></edge>
+ <edge source="abdullah" target="raissi" weight="2"></edge>
+ <edge source="essabar" target="atta" weight="3"></edge>
+ <edge source="essabar" target="bahaji" weight="3"></edge>
+ <edge source="essabar" target="jarrah" weight="3"></edge>
+ <edge source="moqed" target="almihdhar" weight="1"></edge>
+ <edge source="moqed" target="nalhazmi" weight="1"></edge>
+ <edge source="moqed" target="salhazmi" weight="1"></edge>
+ <edge source="moqed" target="hanjour" weight="3"></edge>
+ <edge source="nalhazmi" target="shaikh" weight="2"></edge>
+ <edge source="nalhazmi" target="almihdhar" weight="3"></edge>
+ <edge source="nalhazmi" target="abdi" weight="2"></edge>
+ <edge source="nalhazmi" target="alnami" weight="3"></edge>
+ <edge source="nalhazmi" target="salghamdi" weight="3"></edge>
+ <edge source="nalhazmi" target="hanjour" weight="3"></edge>
+ <edge source="nalhazmi" target="salhazmi" weight="3"></edge>
+ <edge source="salim" target="darkazanli" weight="2"></edge>
+ <edge source="atta" target="hanjour" weight="2"></edge>
+ <edge source="atta" target="moussaoui" weight="1"></edge>
+ <edge source="atta" target="raissi" weight="2"></edge>
+ <edge source="atta" target="al-ani" weight="2"></edge>
+ <edge source="atta" target="jarrah" weight="3"></edge>
+ <edge source="atta" target="bahaji" weight="3"></edge>
+ <edge source="atta" target="darkazanli" weight="2"></edge>
+ <edge source="atta" target="saiid" weight="1"></edge>
+ <edge source="atta" target="walshehri" weight="1"></edge>
+ <edge source="atta" target="banihammad" weight="1"></edge>
+ <edge source="raissi" target="hanjour" weight="2"></edge>
+ <edge source="raissi" target="jarrah" weight="2"></edge>
+ <edge source="bahaji" target="jarrah" weight="3"></edge>
+ <edge source="al-marabh" target="aalghamdi" weight="2"></edge>
+ <edge source="al-marabh" target="hijazi" weight="2"></edge>
+ <edge source="al-marabh" target="salghamdi" weight="2"></edge>
+ <edge source="salhazmi" target="almihdhar" weight="1"></edge>
+ <edge source="salhazmi" target="hanjour" weight="2"></edge>
+ <edge source="salhazmi" target="aalghamdi" weight="1"></edge>
+ <edge source="salhazmi" target="alomari" weight="1"></edge>
+ <edge source="salghamdi" target="alhaznawi" weight="3"></edge>
+ <edge source="aalghamdi" target="hanjour" weight="1"></edge>
+ <edge source="aalghamdi" target="alomari" weight="1"></edge>
+ <edge source="alhaznawi" target="jarrah" weight="3"></edge>
+ <edge source="alomari" target="banihammad" weight="1"></edge>
+ <edge source="alomari" target="walshehri" weight="1"></edge>
+ <edge source="alomari" target="hanjour" weight="1"></edge>
+ <edge source="alnami" target="salghamdi" weight="3"></edge>
+ <edge source="salghamdi" target="hijazi" weight="2"></edge>
+ <edge source="malshehri" target="banihammad" weight="2"></edge>
+ <edge source="almihdhar" target="shaikh" weight="3"></edge>
+ <edge source="almihdhar" target="hanjour" weight="3"></edge>
+ <edge source="walshehri" target="banihammad" weight="1"></edge>
+ <edge source="alsalmi" target="hanjour" weight="1"></edge>
+</graph>
+</graphml>
+
Added: trunk/deployment/cishell-installer/sampledata/Network/terror.xgmml.xml
===================================================================
--- trunk/deployment/cishell-installer/sampledata/Network/terror.xgmml.xml (rev 0)
+++ trunk/deployment/cishell-installer/sampledata/Network/terror.xgmml.xml 2006-10-27 19:54:39 UTC (rev 327)
@@ -0,0 +1,250 @@
+<!-- prefuse graph writer :: Sat Aug 09 15:08:49 PDT 2003 -->
+<graph directed="0">
+ <!-- nodes -->
+ <node id="al-shehhi" label="Marwan Al-Shehhi">
+ <att name="Y" value="435.0"/>
+ <att name="X" value="229.0"/>
+ <att name="flight" value="United Airlines Flight 175 (WTC2)"/>
+ <att name="pilot" value="true"/>
+</node>
+ <node id="alshehri" label="Waleed M. Alshehri">
+ <att name="Y" value="571.0"/>
+ <att name="X" value="383.0"/>
+ <att name="flight" value="American Airlines Flight 11 (WTC1)"/>
+</node>
+ <node id="halghamdi" label="Hamza Alghamdi">
+ <att name="Y" value="329.0"/>
+ <att name="X" value="300.0"/>
+ <att name="flight" value="United Airlines Flight 175 (WTC2)"/>
+</node>
+ <node id="alsuqami" label="Satam M. A. Al Suqami">
+ <att name="Y" value="443.0"/>
+ <att name="X" value="413.0"/>
+ <att name="flight" value="American Airlines Flight 11 (WTC1)"/>
+</node>
+ <node id="omar" label="Ramzi Omar">
+ <att name="Y" value="435.0"/>
+ <att name="X" value="41.0"/>
+</node>
+ <node id="abdullah" label="Rayed Mohammed Abdullah">
+ <att name="Y" value="67.0"/>
+ <att name="X" value="77.0"/>
+</node>
+<node id="essabar" label="Zakariya Essabar">
+ <att name="Y" value="469.0"/>
+ <att name="X" value="126.0"/>
+</node>
+ <node id="moqed" label="Majed Moqed">
+ <att name="Y" value="12.0"/>
+ <att name="X" value="200.0"/>
+ <att name="flight" value="American Airlines Flight 77 (Pentagon)"/>
+</node>
+ <node id="nalhazmi" label="Nawaf Alhazmi">
+ <att name="Y" value="43.0"/>
+ <att name="X" value="460.0"/>
+ <att name="flight" value="American Airlines Flight 77 (Pentagon)"/>
+</node>
+ <node id="salim" label="Mamduh Mahmud Salim">
+ <att name="Y" value="554.0"/>
+ <att name="X" value="71.0"/>
+</node>
+ <node id="atta" label="Mohamed Atta">
+ <att name="Y" value="393.0"/>
+ <att name="X" value="229.0"/>
+ <att name="flight" value="American Airlines Flight 11 (WTC1)"/>
+ <att name="pilot" value="true"/>
+</node>
+ <node id="moussaoui" label="Habib Zacarias Moussaoui">
+ <att name="Y" value="223.0"/>
+ <att name="X" value="201.0"/>
+</node>
+ <node id="raissi" label="Lotfi Raissi">
+ <att name="Y" value="186.0"/>
+ <att name="X" value="77.0"/>
+</node>
+ <node id="bahaji" label="Said Bahaji">
+ <att name="Y" value="393.0"/>
+ <att name="X" value="41.0"/>
+</node>
+ <node id="al-marabh" label="Nabil al-Marabh">
+ <att name="Y" value="311.0"/>
+ <att name="X" value="475.0"/>
+</node>
+ <node id="salhazmi" label="Salem Alhazmi">
+ <att name="Y" value="116.0"/>
+ <att name="X" value="304.0"/>
+ <att name="flight" value="American Airlines Flight 77 (Pentagon)"/>
+</node>
+ <node id="aalghamdi" label="Ahmed Alghamdi">
+ <att name="Y" value="174.0"/>
+ <att name="X" value="359.0"/>
+ <att name="flight" value="United Airlines Flight 175 (WTC2)"/>
+</node>
+ <node id="abdi" label="Mohamed Abdi">
+ <att name="Y" value="73.0"/>
+ <att name="X" value="544.0"/>
+</node>
+ <node id="saiid" label="Shaykh Saiid">
+ <att name="Y" value="517.0"/>
+ <att name="X" value="287.0"/>
+</node>
+ <node id="alhaznawi" label="Ahmed Ibrahim A. Al Haznawi">
+ <att name="Y" value="254.0"/>
+ <att name="X" value="251.0"/>
+ <att name="flight" value="United Airlines Flight 93 (Pennsylvania)"/>
+</node>
+ <node id="alomari" label="Abdulaziz Alomari">
+ <att name="Y" value="387.0"/>
+ <att name="X" value="352.0"/>
+ <att name="flight" value="American Airlines Flight 11 (WTC1)"/>
+</node>
+ <node id="darkazanli" label="Mamoun Darkazanli">
+ <att name="Y" value="516.0"/>
+ <att name="X" value="174.0"/>
+</node>
+ <node id="alnami" label="Ahmed Alnami">
+ <att name="Y" value="161.0"/>
+ <att name="X" value="460.0"/>
+ <att name="flight" value="United Airlines Flight 93 (Pennsylvania)"/>
+</node>
+ <node id="salghamdi" label="Saeed Alghamdi">
+ <att name="Y" value="211.0"/>
+ <att name="X" value="541.0"/>
+ <att name="flight" value="United Airlines Flight 93 (Pennsylvania)"/>
+</node>
+ <node id="hijazi" label="Raed Hijazi">
+ <att name="Y" value="350.0"/>
+ <att name="X" value="541.0"/>
+</node>
+ <node id="malshehri" label="Mohand Alshehri">
+ <att name="Y" value="438.0"/>
+ <att name="X" value="543.0"/>
+ <att name="flight" value="United Airlines Flight 175 (WTC2)"/>
+</node>
+ <node id="almihdhar" label="Khalid Almihdhar">
+ <att name="Y" value="12.0"/>
+ <att name="X" value="364.0"/>
+ <att name="flight" value="American Airlines Flight 77 (Pentagon)"/>
+</node>
+ <node id="shaikh" label="Abdussattar Shaikh">
+ <att name="Y" value="12.0"/>
+ <att name="X" value="529.0"/>
+</node>
+ <node id="jarrah" label="Ziad Samir Jarrah">
+ <att name="Y" value="362.0"/>
+ <att name="X" value="126.0"/>
+ <att name="flight" value="United Airlines Flight 93 (Pennsylvania)"/>
+ <att name="pilot" value="true"/>
+</node>
+ <node id="walshehri" label="Wail M. Alshehri">
+ <att name="Y" value="501.0"/>
+ <att name="X" value="386.0"/>
+ <att name="flight" value="American Airlines Flight 11 (WTC1)"/>
+</node>
+ <node id="banihammad" label="Fayez Rashid Ahmed Hassan Al Qadi Banihammad">
+ <att name="Y" value="536.0"/>
+ <att name="X" value="553.0"/>
+ <att name="flight" value="United Airlines Flight 175 (WTC2)"/>
+</node>
+ <node id="alsalmi" label="Faisal Al Salmi">
+ <att name="Y" value="15.0"/>
+ <att name="X" value="107.0"/>
+</node>
+ <node id="al-ani" label="Ahmed Khalil Ibrahim Samir Al-Ani">
+ <att name="Y" value="280.0"/>
+ <att name="X" value="129.0"/>
+</node>
+ <node id="hanjour" label="Hani Hanjour">
+ <att name="Y" value="67.0"/>
+ <att name="X" value="200.0"/>
+ <att name="flight" value="American Airlines Flight 77 (Pentagon)"/>
+ <att name="pilot" value="true"/>
+</node>
+
+ <!-- edges -->
+ <edge source="al-shehhi" target="halghamdi" weight="1"></edge>
+ <edge source="al-shehhi" target="raissi" weight="2"></edge>
+ <edge source="al-shehhi" target="essabar" weight="3"></edge>
+ <edge source="al-shehhi" target="atta" weight="3"></edge>
+ <edge source="al-shehhi" target="omar" weight="3"></edge>
+ <edge source="al-shehhi" target="bahaji" weight="3"></edge>
+ <edge source="al-shehhi" target="jarrah" weight="3...
[truncated message content] |
|
From: <hu...@us...> - 2006-10-26 21:31:07
|
Revision: 326
http://svn.sourceforge.net/cishell/?rev=326&view=rev
Author: huangb
Date: 2006-10-26 14:30:52 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
add icons for text and grace file format
Added Paths:
-----------
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/grace.png
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/text.png
Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/grace.png
===================================================================
(Binary files differ)
Property changes on: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/grace.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/text.png
===================================================================
(Binary files differ)
Property changes on: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/icons/text.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-10-26 21:28:42
|
Revision: 325
http://svn.sourceforge.net/cishell/?rev=325&view=rev
Author: huangb
Date: 2006-10-26 14:28:35 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
define text and grace data type
Modified Paths:
--------------
trunk/core/org.cishell.framework/src/org/cishell/framework/data/DataProperty.java
Modified: trunk/core/org.cishell.framework/src/org/cishell/framework/data/DataProperty.java
===================================================================
--- trunk/core/org.cishell.framework/src/org/cishell/framework/data/DataProperty.java 2006-10-26 21:27:53 UTC (rev 324)
+++ trunk/core/org.cishell.framework/src/org/cishell/framework/data/DataProperty.java 2006-10-26 21:28:35 UTC (rev 325)
@@ -64,5 +64,11 @@
public static String TREE_TYPE = "Tree";
/** Says this data model is abstractly an unknown type */
- public static String OTHER_TYPE = "Unknown";
+ public static String OTHER_TYPE = "Unknown";
+
+ /** a plain text file */
+ public static String TEXT_TYPE = "Text";
+
+ /** a file can be fed to xmgrace */
+ public static String GRACE_TYPE = "Grace";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-10-26 21:27:57
|
Revision: 324
http://svn.sourceforge.net/cishell/?rev=324&view=rev
Author: huangb
Date: 2006-10-26 14:27:53 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
add the support for text and grace file format
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java
Modified: trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java 2006-10-26 21:27:25 UTC (rev 323)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/DataGUIItem.java 2006-10-26 21:27:53 UTC (rev 324)
@@ -36,6 +36,8 @@
private Image treeIcon;
private Image networkIcon;
private Image unknownIcon;
+ private Image textIcon;
+ private Image graceIcon;
private Map typeToImageMapping;
@@ -60,12 +62,16 @@
treeIcon = createImage("tree.png", this.brandPluginID);
networkIcon = createImage("network.png", this.brandPluginID);
unknownIcon = createImage("unknown.png", this.brandPluginID);
+ textIcon = createImage("text.png", this.brandPluginID);
+ graceIcon = createImage("grace.png", this.brandPluginID);
typeToImageMapping = new HashMap();
registerImage(DataProperty.OTHER_TYPE, unknownIcon);
registerImage(DataProperty.MATRIX_TYPE, matrixIcon);
registerImage(DataProperty.NETWORK_TYPE, networkIcon);
registerImage(DataProperty.TREE_TYPE, treeIcon);
+ registerImage(DataProperty.TEXT_TYPE, textIcon);
+ registerImage(DataProperty.GRACE_TYPE, graceIcon);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-10-26 21:27:30
|
Revision: 323
http://svn.sourceforge.net/cishell/?rev=323&view=rev
Author: huangb
Date: 2006-10-26 14:27:25 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
add the support for text and grace file format
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-26 20:15:50 UTC (rev 322)
+++ trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java 2006-10-26 21:27:25 UTC (rev 323)
@@ -127,6 +127,10 @@
type = DataProperty.NETWORK_TYPE;
} else if (type.equalsIgnoreCase(DataProperty.TREE_TYPE)) {
type = DataProperty.TREE_TYPE;
+ } else if(type.equalsIgnoreCase(DataProperty.TEXT_TYPE)){
+ type = DataProperty.TEXT_TYPE;
+ } else if (type.equalsIgnoreCase(DataProperty.GRACE_TYPE)){
+ type = DataProperty.GRACE_TYPE;
} else {
type = DataProperty.OTHER_TYPE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bea...@us...> - 2006-10-26 20:16:01
|
Revision: 322
http://svn.sourceforge.net/cishell/?rev=322&view=rev
Author: bearsfan
Date: 2006-10-26 13:15:50 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
Fixed a bug in the AbstractDataManagerView, an index was bad.
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-26 18:22:21 UTC (rev 321)
+++ trunk/clients/gui/org.cishell.reference.gui.datamanager/src/org/cishell/reference/gui/datamanager/AbstractDataManagerView.java 2006-10-26 20:15:50 UTC (rev 322)
@@ -288,8 +288,8 @@
for (int i = 0; i < data.length; ++i) {
TreeItem[] treeItems = tree.getItems();
for (int j = 0; j < treeItems.length; ++j) {
- if (treeItems[i].getData() == data[i]) {
- itemSet.add(treeItems[i]);
+ if (treeItems[j].getData() == data[i]) {
+ itemSet.add(treeItems[j]);
break;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-10-26 18:25:25
|
Revision: 321
http://svn.sourceforge.net/cishell/?rev=321&view=rev
Author: huangb
Date: 2006-10-26 11:22:21 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
minus change to adjust the printout messages on the console.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java 2006-10-26 17:52:03 UTC (rev 320)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java 2006-10-26 18:22:21 UTC (rev 321)
@@ -82,9 +82,10 @@
LogService logger = (LogService) ciContext.getService(LogService.class.getName());
String label = (String)ref.getProperty("label");
- if (label != null)
+ if (label != null){
+ logger.log(LogService.LOG_INFO, "..........");
logger.log(LogService.LOG_INFO, label+" was selected.");
-
+ }
String authors = (String)ref.getProperty("authors");
if (authors != null)
logger.log(LogService.LOG_INFO, "Author(s): "+authors);
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-26 17:52:03 UTC (rev 320)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2006-10-26 18:22:21 UTC (rev 321)
@@ -72,7 +72,7 @@
if (logger != null) {
if (!this.parameters.isEmpty()) {
logger.log(LogService.LOG_INFO, "");
- logger.log(LogService.LOG_INFO, "Input Parameters Used:");
+ logger.log(LogService.LOG_INFO, "Input Parameters:");
for (Enumeration e = this.parameters.keys(); e
.hasMoreElements();) {
String key = (String) e.nextElement();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-10-26 17:53:12
|
Revision: 320
http://svn.sourceforge.net/cishell/?rev=320&view=rev
Author: huangb
Date: 2006-10-26 10:52:03 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
remove qualifier from Bundle-Version
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-26 15:51:06 UTC (rev 319)
+++ trunk/templates/org.cishell.templates/META-INF/MANIFEST.MF 2006-10-26 17:52:03 UTC (rev 320)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CIShell Template Code Provider
Bundle-SymbolicName: org.cishell.templates;singleton:=true
-Bundle-Version: 0.1.0.qualifier
+Bundle-Version: 0.1.0
Bundle-Localization: plugin
X-AutoStart: true
Import-Package: org.cishell.framework,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bea...@us...> - 2006-10-26 15:51:17
|
Revision: 319
http://svn.sourceforge.net/cishell/?rev=319&view=rev
Author: bearsfan
Date: 2006-10-26 08:51:06 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
Added check for an empty parameter list
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-26 14:04:09 UTC (rev 318)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2006-10-26 15:51:06 UTC (rev 319)
@@ -70,14 +70,17 @@
LogService logger = getLogService();
if (logger != null) {
- logger.log(LogService.LOG_INFO, "");
- logger.log(LogService.LOG_INFO, "Input Parameters Used:");
- for (Enumeration e = this.parameters.keys();
- e.hasMoreElements();) {
- String key = (String)e.nextElement();
- logger.log(LogService.LOG_INFO, key + ": " + this.parameters.get(key));
- }
- }
+ if (!this.parameters.isEmpty()) {
+ logger.log(LogService.LOG_INFO, "");
+ logger.log(LogService.LOG_INFO, "Input Parameters Used:");
+ for (Enumeration e = this.parameters.keys(); e
+ .hasMoreElements();) {
+ String key = (String) e.nextElement();
+ logger.log(LogService.LOG_INFO, key + ": "
+ + this.parameters.get(key));
+ }
+ }
+ }
Data[] outData = alg.execute();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-10-26 14:04:16
|
Revision: 318
http://svn.sourceforge.net/cishell/?rev=318&view=rev
Author: huangb
Date: 2006-10-26 07:04:09 -0700 (Thu, 26 Oct 2006)
Log Message:
-----------
switch the location of ok and cancel buttons
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGui.java
Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGui.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGui.java 2006-10-25 17:17:55 UTC (rev 317)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGui.java 2006-10-26 14:04:09 UTC (rev 318)
@@ -58,7 +58,7 @@
ObjectClassDefinition ocd = provider.getObjectClassDefinition(id, null);
shell.setText(ocd.getName());
-
+
GridLayout gridLayout = new GridLayout();
gridLayout.numColumns = 1;
shell.setLayout(gridLayout);
@@ -92,16 +92,6 @@
gridData.grabExcessHorizontalSpace = false;
buttonsGroup.setLayoutData(gridData);
- Button cancel = new Button(buttonsGroup, SWT.NONE);
- cancel.setText("Cancel");
- cancel.setSize(40, 20);
- cancel.setFont(defaultFont);
- cancel.addSelectionListener(new SelectionAdapter() {
- public void widgetSelected(SelectionEvent e) {
- close();
- }
- });
-
okButton = new Button(buttonsGroup, SWT.PUSH);
okButton.setText("OK");
okButton.setSize(40, 20);
@@ -116,6 +106,17 @@
}
}
});
+
+ Button cancel = new Button(buttonsGroup, SWT.NONE);
+ cancel.setText("Cancel");
+ cancel.setSize(40, 20);
+ cancel.setFont(defaultFont);
+ cancel.addSelectionListener(new SelectionAdapter() {
+ public void widgetSelected(SelectionEvent e) {
+ close();
+ }
+ });
+
shell.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bea...@us...> - 2006-10-25 17:18:06
|
Revision: 317
http://svn.sourceforge.net/cishell/?rev=317&view=rev
Author: bearsfan
Date: 2006-10-25 10:17:55 -0700 (Wed, 25 Oct 2006)
Log Message:
-----------
Added support to output the parameters given to the algorithm to the console.
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-25 16:52:56 UTC (rev 316)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2006-10-25 17:17:55 UTC (rev 317)
@@ -15,6 +15,7 @@
import java.util.ArrayList;
import java.util.Dictionary;
+import java.util.Enumeration;
import java.util.List;
import org.cishell.app.service.datamanager.DataManagerService;
@@ -28,6 +29,7 @@
import org.cishell.service.guibuilder.GUIBuilderService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
public class AlgorithmWrapper implements Algorithm, AlgorithmProperty {
@@ -66,7 +68,16 @@
AlgorithmFactory factory = (AlgorithmFactory) bContext.getService(ref);
Algorithm alg = factory.createAlgorithm(data, parameters, ciContext);
- //TODO: Print input parameters/metadata here using log service
+ LogService logger = getLogService();
+ if (logger != null) {
+ logger.log(LogService.LOG_INFO, "");
+ logger.log(LogService.LOG_INFO, "Input Parameters Used:");
+ for (Enumeration e = this.parameters.keys();
+ e.hasMoreElements();) {
+ String key = (String)e.nextElement();
+ logger.log(LogService.LOG_INFO, key + ": " + this.parameters.get(key));
+ }
+ }
Data[] outData = alg.execute();
@@ -144,4 +155,16 @@
}
}
}
+
+ private LogService getLogService() {
+ ServiceReference serviceReference = bContext.getServiceReference(DataManagerService.class.getName());
+ LogService log = null;
+
+ if (serviceReference != null) {
+ log = (LogService) bContext.getService(
+ bContext.getServiceReference(LogService.class.getName()));
+ }
+
+ return log;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-10-25 16:53:14
|
Revision: 316
http://svn.sourceforge.net/cishell/?rev=316&view=rev
Author: huangb
Date: 2006-10-25 09:52:56 -0700 (Wed, 25 Oct 2006)
Log Message:
-----------
printout the acknowledgement metadata on the console.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java 2006-10-25 04:56:16 UTC (rev 315)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java 2006-10-25 16:52:56 UTC (rev 316)
@@ -34,6 +34,7 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
+import org.osgi.service.log.LogService;
import org.osgi.service.metatype.MetaTypeProvider;
@@ -75,6 +76,36 @@
Data[] data = this.data;
Converter[][] converters = this.converters;
+ //Print out acknowledge info. Not sure this is the right place.
+ //But it seems working fine.
+
+ LogService logger = (LogService) ciContext.getService(LogService.class.getName());
+
+ String label = (String)ref.getProperty("label");
+ if (label != null)
+ logger.log(LogService.LOG_INFO, label+" was selected.");
+
+ String authors = (String)ref.getProperty("authors");
+ if (authors != null)
+ logger.log(LogService.LOG_INFO, "Author(s): "+authors);
+ String implementers = (String)ref.getProperty("implementers");
+ if (implementers != null)
+ logger.log(LogService.LOG_INFO, "Implementer(s): "+implementers);
+ String integrators = (String)ref.getProperty("integrators");
+ if (integrators != null)
+ logger.log(LogService.LOG_INFO, "Integrator(s): "+integrators);
+ String reference = (String)ref.getProperty("reference");
+ String reference_url = (String)ref.getProperty("reference_url");
+ if (reference != null && reference_url != null )
+ logger.log(LogService.LOG_INFO, "Reference: "+reference+
+ " ( "+reference_url+" )");
+ else if (reference != null && reference_url == null )
+ logger.log(LogService.LOG_INFO, "Reference: "+reference);
+ String docu = (String)ref.getProperty("docu");
+ if (docu != null)
+ logger.log(LogService.LOG_INFO, "Docu: "+docu);
+///////////////////////////
+
SchedulerService scheduler = (SchedulerService)
bContext.getService(bContext.getServiceReference(
SchedulerService.class.getName()));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-10-25 04:56:21
|
Revision: 315
http://svn.sourceforge.net/cishell/?rev=315&view=rev
Author: huangb
Date: 2006-10-24 21:56:16 -0700 (Tue, 24 Oct 2006)
Log Message:
-----------
handle url starting with https
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/LogView.java
Modified: trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/LogView.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/LogView.java 2006-10-24 17:22:45 UTC (rev 314)
+++ trunk/clients/gui/org.cishell.reference.gui.log/src/org/cishell/reference/gui/log/LogView.java 2006-10-25 04:56:16 UTC (rev 315)
@@ -218,8 +218,10 @@
*/
private void appendString(String message, Color color) {
int index = message.indexOf("http://");
-
if (index == -1) {
+ index = message.indexOf("https://");
+ }
+ if (index == -1) {
index = message.indexOf("www.");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-24 17:22:51
|
Revision: 314
http://svn.sourceforge.net/cishell/?rev=314&view=rev
Author: bh2
Date: 2006-10-24 10:22:45 -0700 (Tue, 24 Oct 2006)
Log Message:
-----------
disabled DataValidator usage until we find a better fix
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java 2006-10-24 14:35:20 UTC (rev 313)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java 2006-10-24 17:22:45 UTC (rev 314)
@@ -149,10 +149,13 @@
} else {
originalData = null;
}
+
- setEnabled(data != null && isValid());
+ setEnabled(data != null); //&& isValid());
}
+ //This method will be disabled until we can find a better solution
+ //for extra validation beyond input/output checking
private boolean isValid() {
String valid = null;
String[] classes = (String[]) ref.getProperty(Constants.OBJECTCLASS);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-24 14:35:24
|
Revision: 313
http://svn.sourceforge.net/cishell/?rev=313&view=rev
Author: bh2
Date: 2006-10-24 07:35:20 -0700 (Tue, 24 Oct 2006)
Log Message:
-----------
added another null check
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-24 14:34:55 UTC (rev 312)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2006-10-24 14:35:20 UTC (rev 313)
@@ -110,14 +110,16 @@
if (outData != null && data != null && originalData != null
&& originalData.length == data.length) {
for (int i=0; i < outData.length; i++) {
- Object parent = outData[i].getMetaData().get(DataProperty.PARENT);
-
- if (parent != null) {
- for (int j=0; j < data.length; i++) {
- if (parent == data[j]) {
- outData[i].getMetaData().put(DataProperty.PARENT,
- originalData[j]);
- break;
+ if (outData[i] != null) {
+ Object parent = outData[i].getMetaData().get(DataProperty.PARENT);
+
+ if (parent != null) {
+ for (int j=0; j < data.length; i++) {
+ if (parent == data[j]) {
+ outData[i].getMetaData().put(DataProperty.PARENT,
+ originalData[j]);
+ break;
+ }
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-24 14:34:59
|
Revision: 312
http://svn.sourceforge.net/cishell/?rev=312&view=rev
Author: bh2
Date: 2006-10-24 07:34:55 -0700 (Tue, 24 Oct 2006)
Log Message:
-----------
now runner checks to see if there is any outData for an executable program
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-24 14:05:50 UTC (rev 311)
+++ trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java 2006-10-24 14:34:55 UTC (rev 312)
@@ -86,8 +86,15 @@
}
protected Data[] toData(File[] files) {
- String[] formats = ((String)props.get(AlgorithmProperty.OUT_DATA)).split(",");
+ String outData = (String)props.get(AlgorithmProperty.OUT_DATA);
+ //if out data is null then it returns no data
+ if ((""+outData).trim().equalsIgnoreCase(AlgorithmProperty.NULL_DATA)) {
+ return null;
+ }
+
+ String[] formats = outData.split(",");
+
Map nameToFileMap = new HashMap();
for (int i=0; i < files.length; i++) {
nameToFileMap.put(files[i].getName(), files[i]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-24 14:05:56
|
Revision: 311
http://svn.sourceforge.net/cishell/?rev=311&view=rev
Author: bh2
Date: 2006-10-24 07:05:50 -0700 (Tue, 24 Oct 2006)
Log Message:
-----------
* makes sure parents are from original input data and not the converted data
* added support for "parentage=default"
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java
trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java
Modified: trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java 2006-10-24 05:17:17 UTC (rev 310)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmAction.java 2006-10-24 14:05:50 UTC (rev 311)
@@ -42,6 +42,7 @@
protected BundleContext bContext;
protected ServiceReference ref;
protected Data[] data;
+ protected Data[] originalData;
protected Converter[][] converters;
public AlgorithmAction(ServiceReference ref, BundleContext bContext, CIShellContext ciContext) {
@@ -90,7 +91,7 @@
}
if (params != null) {
- scheduler.schedule(new AlgorithmWrapper(ref, bContext, ciContext, data, converters, params), ref);
+ scheduler.schedule(new AlgorithmWrapper(ref, bContext, ciContext, originalData, data, converters, params), ref);
}
} catch (Throwable e) {
e.printStackTrace();
@@ -142,6 +143,13 @@
}
}
}
+
+ if (data != null) {
+ originalData = (Data[]) data.clone();
+ } else {
+ originalData = null;
+ }
+
setEnabled(data != null && isValid());
}
@@ -157,6 +165,7 @@
//FIXME: Could cause concurrency problems...
for (int j=0; j < data.length; j++) {
if (converters[j] != null && converters[j].length > 0) {
+ //does not work for large inputs...
data[j] = converters[j][0].convert(data[j]);
converters[j] = null;
}
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-24 05:17:17 UTC (rev 310)
+++ trunk/clients/gui/org.cishell.reference.gui.menumanager/src/org/cishell/reference/gui/menumanager/menu/AlgorithmWrapper.java 2006-10-24 14:05:50 UTC (rev 311)
@@ -13,7 +13,9 @@
* ***************************************************************************/
package org.cishell.reference.gui.menumanager.menu;
+import java.util.ArrayList;
import java.util.Dictionary;
+import java.util.List;
import org.cishell.app.service.datamanager.DataManagerService;
import org.cishell.framework.CIShellContext;
@@ -21,6 +23,7 @@
import org.cishell.framework.algorithm.AlgorithmFactory;
import org.cishell.framework.algorithm.AlgorithmProperty;
import org.cishell.framework.data.Data;
+import org.cishell.framework.data.DataProperty;
import org.cishell.service.conversion.Converter;
import org.cishell.service.guibuilder.GUIBuilderService;
import org.osgi.framework.BundleContext;
@@ -31,16 +34,18 @@
protected ServiceReference ref;
protected BundleContext bContext;
protected CIShellContext ciContext;
+ protected Data[] originalData;
protected Data[] data;
protected Converter[][] converters;
protected Dictionary parameters;
- public AlgorithmWrapper(ServiceReference ref, BundleContext bContext,
- CIShellContext ciContext, Data[] data, Converter[][] converters,
- Dictionary parameters) {
+ public AlgorithmWrapper(ServiceReference ref, BundleContext bContext,
+ CIShellContext ciContext, Data[] originalData, Data[] data,
+ Converter[][] converters, Dictionary parameters) {
this.ref = ref;
this.bContext = bContext;
this.ciContext = ciContext;
+ this.originalData = originalData;
this.data = data;
this.converters = converters;
this.parameters = parameters;
@@ -70,7 +75,18 @@
bContext.getService(bContext.getServiceReference(
DataManagerService.class.getName()));
+ doParentage(outData);
+
+ List goodData = new ArrayList();
for (int i=0; i < outData.length; i++) {
+ if (outData[i] != null) {
+ goodData.add(outData[i]);
+ }
+ }
+
+ outData = (Data[]) goodData.toArray(new Data[0]);
+
+ if (outData.length != 0) {
dataManager.setSelectedData(outData);
}
}
@@ -86,4 +102,44 @@
return new Data[0];
}
}
+
+ //only does anything if parentage=default so far...
+ protected void doParentage(Data[] outData) {
+ //make sure the parent set is the original Data and not the
+ //converted data...
+ if (outData != null && data != null && originalData != null
+ && originalData.length == data.length) {
+ for (int i=0; i < outData.length; i++) {
+ Object parent = outData[i].getMetaData().get(DataProperty.PARENT);
+
+ if (parent != null) {
+ for (int j=0; j < data.length; i++) {
+ if (parent == data[j]) {
+ outData[i].getMetaData().put(DataProperty.PARENT,
+ originalData[j]);
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ //check and act on parentage settings
+ String parentage = (String)ref.getProperty("parentage");
+ if (parentage != null) {
+ parentage = parentage.trim();
+ if (parentage.equalsIgnoreCase("default")) {
+ if (originalData != null && originalData.length > 0 && originalData[0] != null) {
+
+ for (int i=0; i < outData.length; i++) {
+ //if they don't have a parent set already then we set one
+ if (outData[i] != null &&
+ outData[i].getMetaData().get(DataProperty.PARENT) == null) {
+ outData[i].getMetaData().put(DataProperty.PARENT, originalData[0]);
+ }
+ }
+ }
+ }
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-10-24 05:17:26
|
Revision: 310
http://svn.sourceforge.net/cishell/?rev=310&view=rev
Author: huangb
Date: 2006-10-23 22:17:17 -0700 (Mon, 23 Oct 2006)
Log Message:
-----------
when there are multiple converters that can support a certain file format
(such as .xml), the application will automatically try one by one till find
a good converter to load the file. (the old feature is the application will
ask users to choose a converter) If all converters didn't work, the application
will report the error in the end.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java 2006-10-23 21:49:51 UTC (rev 309)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/load/FileLoad.java 2006-10-24 05:17:17 UTC (rev 310)
@@ -93,6 +93,7 @@
}
final class DataUpdater implements Runnable{
+ boolean loadFileSuccess = false;
IWorkbenchWindow window;
ArrayList returnList = new ArrayList();
@@ -146,27 +147,59 @@
"Sorry, the file format: *."+fileExtension+" is not supported so far. \n"+
"Please send your requests to cis...@li.... \n"
+"Thank you.");
- return;
+
}
//<filename>[.<data model type>][.<index>]
// only one persister found, so load the model
- if (serviceRefList.length == 1){
- logger.log(LogService.LOG_INFO, "Loaded: "+file.getPath());
+ else if (serviceRefList.length == 1){
AlgorithmFactory persister = (AlgorithmFactory)bContext.getService(serviceRefList[0]);
Data[] dm = new Data[]{new BasicData(file.getPath(), String.class.getName()) };
dm = persister.createAlgorithm(dm, null, ciContext).execute();
- for (int i=0; i<dm.length; i++)
- returnList.add(dm[i]);
- return;
+ if (dm != null){
+ loadFileSuccess = true;
+ logger.log(LogService.LOG_INFO, "Loaded: "+file.getPath());
+ for (int i=0; i<dm.length; i++)
+ returnList.add(dm[i]);
+ }
+
}
// lots of persisters found, return the chooser
- new LoadDataChooser("Load", file, window.getShell(),
- ciContext, bContext, serviceRefList, returnList).open();
-
+ else if (serviceRefList.length > 1){
+// new LoadDataChooser("Load", file, window.getShell(),
+// ciContext, bContext, serviceRefList, returnList).open();
+ for (int index=0; index<serviceRefList.length; index++){
+ AlgorithmFactory persister = (AlgorithmFactory)bContext.getService(serviceRefList[index]);
+ Data[] dm = new Data[]{new BasicData(file.getPath(), String.class.getName()) };
+ dm = persister.createAlgorithm(dm, null, ciContext).execute();
+ if (dm != null ){
+ loadFileSuccess = true;
+ logger.log(LogService.LOG_INFO, "Loaded: "+file.getPath());
+ for (int i=0; i<dm.length; i++){
+ returnList.add(dm[i]);
+ }
+ break;
+ }
+ }
+ }
+ if (serviceRefList != null){
+ if(serviceRefList.length >0 && !loadFileSuccess){
+ guiBuilder.showError("Can Not Load The File",
+ "Sorry, it's very possible that you have a wrong file format," +
+ "since the file can not be loaded to the application.",
+
+ "Please check Data Formats that this application can support at "+
+ "https://nwb.slis.indiana.edu/community/?n=Algorithms.HomePage." +
+ "And send your requests or report the problem to "+
+ "cis...@li.... \n"+"Thank you.");
+ }
+ }
+
+
+
}catch (Exception e){
e.printStackTrace();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-23 21:50:06
|
Revision: 309
http://svn.sourceforge.net/cishell/?rev=309&view=rev
Author: bh2
Date: 2006-10-23 14:49:51 -0700 (Mon, 23 Oct 2006)
Log Message:
-----------
finally finished feature to allow files to be saved w/o a converter.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties
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/SaveFactory.java
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties 2006-10-23 21:19:35 UTC (rev 308)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties 2006-10-23 21:49:51 UTC (rev 309)
@@ -1,7 +1,7 @@
menu_path=File/start
label=Save...
description=Saves data to disk
-in_data=file:*
+in_data=java.lang.Object
out_data=null
service.pid=org.cishell.reference.gui.persistence.save.Save
remoteable=false
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-23 21:19:35 UTC (rev 308)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java 2006-10-23 21:49:51 UTC (rev 309)
@@ -26,9 +26,8 @@
Data[] data;
Dictionary parameters;
CIShellContext context;
+ Shell parentShell;
- final Shell parentShell;
-
private GUIBuilderService guiBuilder;
private DataConversionService conversionManager;
@@ -44,8 +43,6 @@
this.parameters = parameters;
this.context = context;
- this.parentShell = PlatformUI.getWorkbench().getWorkbenchWindows()[0].getShell();
-
this.conversionManager = (DataConversionService) context.getService(
DataConversionService.class.getName());
@@ -64,9 +61,11 @@
if (converters.length < 1 && !(data[0].getData() instanceof File)) {
guiBuilder.showError("No Converters",
"No valid converters for data type: " +
- data[0].getData().getClass().getName(),
+ data[0].getFormat(),
"Please install a plugin that will save the data type to a file");
} else {
+ parentShell = PlatformUI.getWorkbench().getWorkbenchWindows()[0].getShell();
+
if (!parentShell.isDisposed()) {
guiRun(new Runnable() {
public void run() {
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java 2006-10-23 21:19:35 UTC (rev 308)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java 2006-10-23 21:49:51 UTC (rev 309)
@@ -16,6 +16,10 @@
/**
* Create a Save object
+ *
+ * TODO: Should also support if we can convert to file, but have
+ * no final file:X->file-ext:* converter.
+ *
* @author bmarkine
*
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-23 21:19:50
|
Revision: 308
http://svn.sourceforge.net/cishell/?rev=308&view=rev
Author: bh2
Date: 2006-10-23 14:19:35 -0700 (Mon, 23 Oct 2006)
Log Message:
-----------
finished feature to allow files to be saved w/o a converter.
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties 2006-10-23 21:13:22 UTC (rev 307)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/OSGI-INF/save.properties 2006-10-23 21:19:35 UTC (rev 308)
@@ -1,7 +1,7 @@
menu_path=File/start
label=Save...
description=Saves data to disk
-in_data=java.lang.Object
+in_data=file:*
out_data=null
service.pid=org.cishell.reference.gui.persistence.save.Save
remoteable=false
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-23 21:13:32
|
Revision: 307
http://svn.sourceforge.net/cishell/?rev=307&view=rev
Author: bh2
Date: 2006-10-23 14:13:22 -0700 (Mon, 23 Oct 2006)
Log Message:
-----------
finished feature to allow files to be saved w/o a converter.
Modified Paths:
--------------
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/Save.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-23 21:01:37 UTC (rev 306)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/FileSaver.java 2006-10-23 21:13:22 UTC (rev 307)
@@ -18,7 +18,6 @@
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Shell;
-import org.osgi.framework.ServiceReference;
import org.osgi.service.log.LogService;
/**
@@ -86,9 +85,7 @@
* @return Whether or not the save was successful
*/
public boolean save(Converter converter, Data data) {
- ServiceReference[] serviceReferenceArray = converter.getConverterChain();
- String outDataStr = (String)serviceReferenceArray[serviceReferenceArray.length-1]
- .getProperty(AlgorithmProperty.OUT_DATA);
+ String outDataStr = (String)converter.getProperties().get(AlgorithmProperty.OUT_DATA);
String ext = outDataStr.substring(outDataStr.indexOf(':')+1);
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-23 21:01:37 UTC (rev 306)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java 2006-10-23 21:13:22 UTC (rev 307)
@@ -2,9 +2,12 @@
import java.io.File;
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.cishell.service.conversion.DataConversionService;
@@ -12,6 +15,7 @@
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
+import org.osgi.framework.ServiceReference;
/**
* Save algorithm for persisting a data object
@@ -62,15 +66,31 @@
"No valid converters for data type: " +
data[0].getData().getClass().getName(),
"Please install a plugin that will save the data type to a file");
- }
- else {
+ } else {
if (!parentShell.isDisposed()) {
guiRun(new Runnable() {
public void run() {
if (converters.length == 0) {
- //TODO: finish this
- //final FileSaver saver = new FileSaver(parentShell, context);
- //saver.save(null, data[0]);
+ final FileSaver saver = new FileSaver(parentShell, context);
+ saver.save(new Converter(){
+ Dictionary props = new Hashtable();
+
+ public Data convert(Data data) {
+ return data;
+ }
+
+ public AlgorithmFactory getAlgorithmFactory() {
+ return null;
+ }
+
+ public ServiceReference[] getConverterChain() {
+ return null;
+ }
+
+ public Dictionary getProperties() {
+ props.put(AlgorithmProperty.OUT_DATA, "file:*");
+ return props;
+ }}, data[0]);
} else if (converters.length == 1) {
final FileSaver saver = new FileSaver(parentShell, context);
saver.save(converters[0], data[0]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-10-23 21:01:42
|
Revision: 306
http://svn.sourceforge.net/cishell/?rev=306&view=rev
Author: huangb
Date: 2006-10-23 14:01:37 -0700 (Mon, 23 Oct 2006)
Log Message:
-----------
first part of feature to allow files to be saved w/o a converter. will finish on another machine.
Modified Paths:
--------------
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/SaveFactory.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-23 20:45:24 UTC (rev 305)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/Save.java 2006-10-23 21:01:37 UTC (rev 306)
@@ -1,5 +1,6 @@
package org.cishell.reference.gui.persistence.save;
+import java.io.File;
import java.util.Dictionary;
import org.cishell.framework.CIShellContext;
@@ -56,7 +57,7 @@
//This only checks the first Data in the array
final Converter[] converters = conversionManager.findConverters(data[0], "file-ext:*");
- if (converters.length < 1) {
+ if (converters.length < 1 && !(data[0].getData() instanceof File)) {
guiBuilder.showError("No Converters",
"No valid converters for data type: " +
data[0].getData().getClass().getName(),
@@ -66,7 +67,11 @@
if (!parentShell.isDisposed()) {
guiRun(new Runnable() {
public void run() {
- if (converters.length == 1) {
+ if (converters.length == 0) {
+ //TODO: finish this
+ //final FileSaver saver = new FileSaver(parentShell, context);
+ //saver.save(null, data[0]);
+ } else if (converters.length == 1) {
final FileSaver saver = new FileSaver(parentShell, context);
saver.save(converters[0], data[0]);
} else {
Modified: trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java 2006-10-23 20:45:24 UTC (rev 305)
+++ trunk/clients/gui/org.cishell.reference.gui.persistence/src/org/cishell/reference/gui/persistence/save/SaveFactory.java 2006-10-23 21:01:37 UTC (rev 306)
@@ -1,5 +1,6 @@
package org.cishell.reference.gui.persistence.save;
+import java.io.File;
import java.util.Dictionary;
import org.cishell.framework.CIShellContext;
@@ -68,7 +69,7 @@
//Fix me
//Bonnie:why only check data[0]? An user can select multiple objects from data manager.
Converter[] converters = conversionManager.findConverters(data[0], "file-ext:*");
- if (converters.length == 0) {
+ if (converters.length == 0 && !(data[0].getData() instanceof File)) {
return "No valid converters from " +
data[0].getData().getClass().getName() + " to any file extension";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hu...@us...> - 2006-10-23 20:45:41
|
Revision: 305
http://svn.sourceforge.net/cishell/?rev=305&view=rev
Author: huangb
Date: 2006-10-23 13:45:24 -0700 (Mon, 23 Oct 2006)
Log Message:
-----------
trim the string of the "outFile[*].type" and get rid of whitespace if any.
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-23 16:50:05 UTC (rev 304)
+++ trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java 2006-10-23 20:45:24 UTC (rev 305)
@@ -113,7 +113,7 @@
data[i].getMetaData().put(DataProperty.LABEL, label);
String type = props.getProperty("outFile["+i+"].type", DataProperty.OTHER_TYPE);
-
+ type = type.trim();
if (type.equalsIgnoreCase(DataProperty.MATRIX_TYPE)) {
type = DataProperty.MATRIX_TYPE;
} else if (type.equalsIgnoreCase(DataProperty.NETWORK_TYPE)) {
@@ -123,7 +123,7 @@
} else {
type = DataProperty.OTHER_TYPE;
}
-
+
data[i].getMetaData().put(DataProperty.TYPE, type);
}
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bh...@us...> - 2006-10-23 16:50:14
|
Revision: 304
http://svn.sourceforge.net/cishell/?rev=304&view=rev
Author: bh2
Date: 2006-10-23 09:50:05 -0700 (Mon, 23 Oct 2006)
Log Message:
-----------
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-19 19:22:57 UTC (rev 303)
+++ trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java 2006-10-23 16:50:05 UTC (rev 304)
@@ -111,6 +111,20 @@
String label = props.getProperty("outFile["+i+"].label", f.getName());
data[i].getMetaData().put(DataProperty.LABEL, label);
+
+ String type = props.getProperty("outFile["+i+"].type", DataProperty.OTHER_TYPE);
+
+ if (type.equalsIgnoreCase(DataProperty.MATRIX_TYPE)) {
+ type = DataProperty.MATRIX_TYPE;
+ } else if (type.equalsIgnoreCase(DataProperty.NETWORK_TYPE)) {
+ type = DataProperty.NETWORK_TYPE;
+ } else if (type.equalsIgnoreCase(DataProperty.TREE_TYPE)) {
+ type = DataProperty.TREE_TYPE;
+ } else {
+ type = DataProperty.OTHER_TYPE;
+ }
+
+ data[i].getMetaData().put(DataProperty.TYPE, type);
}
} else {
Iterator iter = nameToFileMap.values().iterator();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bea...@us...> - 2006-10-19 19:23:03
|
Revision: 303
http://svn.sourceforge.net/cishell/?rev=303&view=rev
Author: bearsfan
Date: 2006-10-19 12:22:57 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
Removed duplicate converter chains revised. Now does it correctly by overwriting the hashcode method as well as the equals method. Unique coverter chains are now detected through the Hashset
Modified Paths:
--------------
trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java
trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java
Modified: trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java
===================================================================
--- trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java 2006-10-19 17:47:11 UTC (rev 302)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/ConverterImpl.java 2006-10-19 19:22:57 UTC (rev 303)
@@ -33,7 +33,7 @@
*
* @author Bruce Herr (bh...@bh...)
*/
-public class ConverterImpl implements Converter, AlgorithmFactory, AlgorithmProperty, Comparable {
+public class ConverterImpl implements Converter, AlgorithmFactory, AlgorithmProperty {
private ServiceReference[] refs;
private BundleContext bContext;
private Dictionary props;
@@ -121,6 +121,18 @@
public MetaTypeProvider createParameters(Data[] dm) {
return null;
}
+
+ public int hashCode() {
+ return toString().hashCode();
+ }
+
+ public String toString() {
+ String str ="";
+ for (int j = 0; j < refs.length; ++j) {
+ str += refs[j].getProperty(Constants.SERVICE_ID) + " " + refs[j].getProperty(Constants.SERVICE_PID) + "-> ";
+ }
+ return str;
+ }
public boolean equals(Object o) {
boolean equals = false;
@@ -171,8 +183,4 @@
return dm;
}
}
-
- public int compareTo(Object o) {
- return equals(o) ? 0 : 1;
- }
}
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-19 17:47:11 UTC (rev 302)
+++ trunk/core/org.cishell.reference/src/org/cishell/reference/service/conversion/DataConversionServiceImpl.java 2006-10-19 19:22:57 UTC (rev 303)
@@ -130,7 +130,7 @@
* @param outFormat The format to convert to
*/
public Converter[] findConverters(String inFormat, String outFormat) {
- //saveGraph();
+ saveGraph();
if (inFormat != null && inFormat.length() > 0 &&
outFormat != null && outFormat.length() > 0) {
@@ -325,42 +325,19 @@
converters = findConverters(format, outFormat);
set.addAll(new HashSet(Arrays.asList(converters)));
}
-
if (!(data.getData() instanceof File) && data.getData() != null) {
Iterator iter = getClassesFor(data.getData().getClass()).iterator();
while (iter.hasNext()) {
Class c = (Class) iter.next();
converters = findConverters(c.getName(), outFormat);
- //this is a bit of a hack to remove the duplicate converters
- addUniqueConverters(set, converters);
- //set.addAll(new HashSet(Arrays.asList(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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
