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: <tan...@us...> - 2009-09-16 15:46:49
|
Revision: 952
http://cishell.svn.sourceforge.net/cishell/?rev=952&view=rev
Author: tankchintan
Date: 2009-09-16 15:46:35 +0000 (Wed, 16 Sep 2009)
Log Message:
-----------
Adding Digital certificates to the repository.
Added Paths:
-----------
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ca.crt
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ca.key
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.crt
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.csr
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.key
trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.p12
Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ca.crt
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ca.crt (rev 0)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ca.crt 2009-09-16 15:46:35 UTC (rev 952)
@@ -0,0 +1,38 @@
+-----BEGIN CERTIFICATE-----
+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
+XTVTj2IU
+-----END CERTIFICATE-----
Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ca.key
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ca.key (rev 0)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ca.key 2009-09-16 15:46:35 UTC (rev 952)
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.crt
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.crt (rev 0)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.crt 2009-09-16 15:46:35 UTC (rev 952)
@@ -0,0 +1,32 @@
+-----BEGIN CERTIFICATE-----
+MIIFljCCA34CAQEwDQYJKoZIhvcNAQEFBQAwgYwxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdJbmRpYW5hMRQwEgYDVQQHEwtCbG9vbWluZ3RvbjENMAsGA1UEChMEU0xJ
+UzEMMAoGA1UECxMDQ05TMRUwEwYDVQQDEwxDaGludGFuIFRhbmsxITAfBgkqhkiG
+9w0BCQEWEmNkdGFua0BpbmRpYW5hLmVkdTAeFw0wOTA5MTUxNzEwMDJaFw0xMTA5
+MTUxNzEwMDJaMIGUMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHSW5kaWFuYTEUMBIG
+A1UEBxMLQmxvb21pbmd0b24xEDAOBgNVBAoTB0NOUy1JVkwxDTALBgNVBAsTBFNM
+SVMxGDAWBgNVBAMTD0NoaW50YW4gRC4gVGFuazEiMCAGCSqGSIb3DQEJARYTY2R0
+YW5rQHVtYWlsLml1LmVkdTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+APtUSU0oeYNCQpKlG0Wc5cUTv4AYJPw/4QY+a4Ky+vDexWmWcWyBQloNqcFHQ/6p
+djkq6BXhzd5pZDioR94mfT3zGV/59Q6GR4gaooAuPTr0acPpWiFM6Dwx4yisnwoo
+1bAwfTwdVoX31YUn8Ngp3Xc5vGmBLZ5aYJV5EKf687ZpxnMXaYLAIefeVkS4Xp1q
+ioOYnMQ+OmxEGKjceSc3FQyR/of45PCjuxb7vB9bv6ALO9uJClFIWssv/Jcyyc6j
+kUMjcCYtwHXkLVI++CHDZPCqY9+OC+v2dG/CRITl4FbFLisZnMkFmKL/q8r2QWLs
+uAIgOOczXBXR7DeX5A/YTirctxSJPSTkUjeZYwUnnwSfOv5BK87Qvjb82Zia5XGj
+qxgfk5/qkUW84QCv3R5RSe0Rh6Ni87JOVAZGffET9QQRAxKrAC0KzLFgo3pHxBOs
+iHRCaF9dRVu8bLo/Nn/ZpByu/e+A5HpNndeQj2+spWOsHZBG98/mBwPthMEVQljc
+p4hhQ5DMijJIv7Sx43S+Mer6whqc0Q2zUUbzTSmdezrmGXNZO6R7hLr/0ExXI36z
+QJKlIG7eAVmg7b/kszuPAEOcOVLRIi9kLV7MgUNwfHjbYXtCQHGQsIWS4GpCC9Vh
+2heEy78TQWiMyofbf4Lavp19CAqKTrCGTHPc50dJn4D7AgMBAAEwDQYJKoZIhvcN
+AQEFBQADggIBAEddMyHMytdguvTQWQyR5RxOX2a1qLvYQfYXduVCZIVDdgqvtqTk
+Zp7alqxINAmzpuoGxaHGXy5GyaSxbW0xJf2MmFIePhLvOQvtUguFpTE7Or68rC/Z
+wmpPZpff5ABBXISkfTbn2kO3UbEGIl7oRAltlKTboq+ni+sCFYwf8dX48YbKlUnS
+caI3f5YST8IMyle9U40IKSqyy+9C6t8U2LT5oHwC2y+IOo4J/VymqLp12GbCL4NT
+QSxI3fTg1K09OQwvVDxfFgAg1rBp9A/JHuRnl1iPRYiT3UEz9xR2nFCest1hiJlB
+ZSFlOOZc91PcxdrHBhOUmyi4LcIZR1nB0GiAV87aCycWc/r6zpqM7m9Fx2NPR+RU
+lktGsX1M+gFmVmH03Ylv0VEnsBQ5EosT+jnd7X5AggZ7ULiCRkLUGNhY2lxgKbYx
+PSFMqwI9mJVb1IR5fBoAZH8h4g7VRU9Ge9zDUC65sGOyxts3orSuqSVJ6qSlGQqr
+5FKsC/OVbC4LtZ1fKzmwl1SFo4Rlgb3vXKk3dNUFa9bq88ccTOU8P+plYOPDHWA5
+gsixp+iCIJBh70lt3y4vkpTaehN8I3MhMVb/S0TlBNyRA5g3rXCllNt9qSZ0RT7o
+4dUWlQUcU8T4HA3JFQK4wk7sc3GMwHbM5dhRTkiSKVnntXVH/yyKGxZd
+-----END CERTIFICATE-----
Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.csr
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.csr (rev 0)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.csr 2009-09-16 15:46:35 UTC (rev 952)
@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIE2jCCAsICAQAwgZQxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdJbmRpYW5hMRQw
+EgYDVQQHEwtCbG9vbWluZ3RvbjEQMA4GA1UEChMHQ05TLUlWTDENMAsGA1UECxME
+U0xJUzEYMBYGA1UEAxMPQ2hpbnRhbiBELiBUYW5rMSIwIAYJKoZIhvcNAQkBFhNj
+ZHRhbmtAdW1haWwuaXUuZWR1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA+1RJTSh5g0JCkqUbRZzlxRO/gBgk/D/hBj5rgrL68N7FaZZxbIFCWg2pwUdD
+/ql2OSroFeHN3mlkOKhH3iZ9PfMZX/n1DoZHiBqigC49OvRpw+laIUzoPDHjKKyf
+CijVsDB9PB1WhffVhSfw2Cnddzm8aYEtnlpglXkQp/rztmnGcxdpgsAh595WRLhe
+nWqKg5icxD46bEQYqNx5JzcVDJH+h/jk8KO7Fvu8H1u/oAs724kKUUhayy/8lzLJ
+zqORQyNwJi3AdeQtUj74IcNk8Kpj344L6/Z0b8JEhOXgVsUuKxmcyQWYov+ryvZB
+Yuy4AiA45zNcFdHsN5fkD9hOKty3FIk9JORSN5ljBSefBJ86/kErztC+NvzZmJrl
+caOrGB+Tn+qRRbzhAK/dHlFJ7RGHo2Lzsk5UBkZ98RP1BBEDEqsALQrMsWCjekfE
+E6yIdEJoX11FW7xsuj82f9mkHK7974Dkek2d15CPb6ylY6wdkEb3z+YHA+2EwRVC
+WNyniGFDkMyKMki/tLHjdL4x6vrCGpzRDbNRRvNNKZ17OuYZc1k7pHuEuv/QTFcj
+frNAkqUgbt4BWaDtv+SzO48AQ5w5UtEiL2QtXsyBQ3B8eNthe0JAcZCwhZLgakIL
+1WHaF4TLvxNBaIzKh9t/gtq+nX0ICopOsIZMc9znR0mfgPsCAwEAAaAAMA0GCSqG
+SIb3DQEBBQUAA4ICAQA6RMDXG9kh5Cz/WbuzXuqjIppdi5n884xC3tN49FbIz/kz
+SVOU76YqpKQWODiz7ppAO8GkgbSutsjzvbLS0xOULvRag5CyKixIgxY/aCDau++I
+SjNj2yrJDXdS9kbnlvOOK8WdIr/M3nh0SyImyfg7u5MtMTF1TKC399rvEfm9GX6Q
+sQWqEifrN09/SJ3ptGOYtdtFSI4ebRpD6eWLf//9E9eHD+jWlckMuLr5aqn6THEF
+yGkjhw5oixuISsApMjOyE2yNhmUd90JiVrhAxFT6a/bYVvT8qkkI9Y6g9zU/aIh/
+hxfv+2rBioQ14L7gkXJb5MvU7R9cPDzUbQBOdbL8xFizcTUS9Fsi+uyWnLSI5PLE
+IoMIUG1275MXz8QJTvTxNU1ZrCOp28cZ3E7ZWsrcmArY6+QQU5vNO9n769cs2BA4
+baNIGQ92gCW23pzl4ha0d0W42Xl6WGIu68edfrsWyDJi+GZZViTFhWUjp0xfYOSF
+C12o9DmtjK3zud5vV++2X9OM//lHD5cvYSvGzzZQycdWt1kNj6wHXFkU78GRG0Qv
+SRMWq3BonrONKLlqA2mdj0OdB8OHHz3DNBA9KPqslPZ8SnVAH+94aqfQmjLwXHax
+tma6mrsfgcIwJjSG+DfShSN7XQiZjAfHNUAoLnoD95wQjDJnp2MYxNtuKnjC+Q==
+-----END CERTIFICATE REQUEST-----
Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.key
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.key (rev 0)
+++ trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.key 2009-09-16 15:46:35 UTC (rev 952)
@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----
Added: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.p12
===================================================================
(Binary files differ)
Property changes on: trunk/clients/gui/org.cishell.reference.gui.brand.cishell/digital-certificate-files/ia.p12
___________________________________________________________________
Added: 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: <jrb...@us...> - 2009-09-14 21:34:56
|
Revision: 951
http://cishell.svn.sourceforge.net/cishell/?rev=951&view=rev
Author: jrbibers
Date: 2009-09-14 21:34:47 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
Added to ArrayUtilities, in particular for ParameterMutator work in the Specified (prefuse beta) visualization.
Modified Paths:
--------------
trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayUtilities.java
Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayUtilities.java 2009-09-14 20:15:09 UTC (rev 950)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayUtilities.java 2009-09-14 21:34:47 UTC (rev 951)
@@ -1,5 +1,8 @@
package org.cishell.utilities;
+import java.util.Iterator;
+import java.util.List;
+
public class ArrayUtilities {
public static int indexOf(Object[] array, Object target) {
for (int ii = 0; ii < array.length; ii++) {
@@ -10,4 +13,33 @@
return -1;
}
+
+ public static void swapFirstMatchToFront(Object[] array, List targets) {
+ for (Iterator targetsIt = targets.iterator(); targetsIt.hasNext();) {
+ Object target = (Object) targetsIt.next();
+ int index = ArrayUtilities.indexOf(array, target);
+
+ if ( index != -1 ) {
+ swap(array, 0, index);
+ return;
+ }
+
+ }
+ }
+
+ public static void swap(Object[] array, int i, int j) {
+ Object temp = array[i];
+ array[i] = array[j];
+ array[j] = temp;
+ }
+
+ public static String[] clone(String[] array) {
+ String[] clone = new String[array.length];
+
+ for (int ii = 0; ii < array.length; ii++) {
+ clone[ii] = array[ii];
+ }
+
+ return clone;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2009-09-14 20:15:17
|
Revision: 950
http://cishell.svn.sourceforge.net/cishell/?rev=950&view=rev
Author: mwlinnem
Date: 2009-09-14 20:15:09 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
Updated version so build site builds correctly (hopefully).
Modified Paths:
--------------
trunk/templates/org.cishell.templates.wizards/META-INF/MANIFEST.MF
Modified: trunk/templates/org.cishell.templates.wizards/META-INF/MANIFEST.MF
===================================================================
--- trunk/templates/org.cishell.templates.wizards/META-INF/MANIFEST.MF 2009-09-14 19:26:18 UTC (rev 949)
+++ trunk/templates/org.cishell.templates.wizards/META-INF/MANIFEST.MF 2009-09-14 20:15:09 UTC (rev 950)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: CIShell Integration Wizards
Bundle-SymbolicName: org.cishell.templates.wizards;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.0.1
Bundle-Activator: org.cishell.templates.wizards.Activator
Require-Bundle: org.eclipse.ui;bundle-version="3.2.0",
org.eclipse.ui.ide;bundle-version="3.2.0",
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2009-09-14 19:26:29
|
Revision: 949
http://cishell.svn.sourceforge.net/cishell/?rev=949&view=rev
Author: mwlinnem
Date: 2009-09-14 19:26:18 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
Updated to reference new version of development feature.
Modified Paths:
--------------
trunk/deployment/org.cishell.update/site.xml
Modified: trunk/deployment/org.cishell.update/site.xml
===================================================================
--- trunk/deployment/org.cishell.update/site.xml 2009-09-14 19:22:55 UTC (rev 948)
+++ trunk/deployment/org.cishell.update/site.xml 2009-09-14 19:26:18 UTC (rev 949)
@@ -3,9 +3,6 @@
<description url="http://cishell.org/update">
Update site for CIShell: Cyberinfrastructure Shell
</description>
- <feature url="features/org.cishell.development.feature_1.0.0.jar" id="org.cishell.development.feature" version="1.0.0">
- <category name="Development"/>
- </feature>
<feature url="features/org.cishell.reference.gui.brand.feature_1.0.0.jar" id="org.cishell.reference.gui.brand.feature" version="1.0.0">
<category name="Applications"/>
</feature>
@@ -18,6 +15,9 @@
<feature url="features/org.cishell.reference.feature_1.0.0.jar" id="org.cishell.reference.feature" version="1.0.0">
<category name="Core Features"/>
</feature>
+ <feature url="features/org.cishell.development.feature_1.0.1.jar" id="org.cishell.development.feature" version="1.0.1">
+ <category name="Development"/>
+ </feature>
<category-def name="Development" label="Development"/>
<category-def name="Applications" label="Applications">
<description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2009-09-14 19:23:08
|
Revision: 948
http://cishell.svn.sourceforge.net/cishell/?rev=948&view=rev
Author: mwlinnem
Date: 2009-09-14 19:22:55 +0000 (Mon, 14 Sep 2009)
Log Message:
-----------
Changing version to reflect addition of non-Java wizard (otherwise update sites will say there's no need to update to this version).
Modified Paths:
--------------
trunk/deployment/org.cishell.development.feature/feature.xml
Modified: trunk/deployment/org.cishell.development.feature/feature.xml
===================================================================
--- trunk/deployment/org.cishell.development.feature/feature.xml 2009-09-05 23:47:51 UTC (rev 947)
+++ trunk/deployment/org.cishell.development.feature/feature.xml 2009-09-14 19:22:55 UTC (rev 948)
@@ -2,7 +2,7 @@
<feature
id="org.cishell.development.feature"
label="CIShell Algorithm Development Plug-In"
- version="1.0.0">
+ version="1.0.1">
<description url="http://cishell.org">
The CIShell Algorithm Development Pack
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-09-05 23:47:59
|
Revision: 947
http://cishell.svn.sourceforge.net/cishell/?rev=947&view=rev
Author: pataphil
Date: 2009-09-05 23:47:51 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
Forgot to remove a debug message before.
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 2009-09-05 23:45:29 UTC (rev 946)
+++ trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java 2009-09-05 23:47:51 UTC (rev 947)
@@ -444,7 +444,6 @@
for (int i = 0; i < data.length; i++) {
File inFile = (File)data[i].getData();
String filePath = inFile.getAbsolutePath();
- System.err.println("inFile[" + i + "]: \"" + filePath + "\" exists: " + inFile.exists());
if (File.separatorChar == '\\') {
filePath = filePath.replace(File.separatorChar, '/');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-09-05 23:45:36
|
Revision: 946
http://cishell.svn.sourceforge.net/cishell/?rev=946&view=rev
Author: pataphil
Date: 2009-09-05 23:45:29 +0000 (Sat, 05 Sep 2009)
Log Message:
-----------
Very minor code cleanup/refactoring.
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 2009-09-04 21:08:26 UTC (rev 945)
+++ trunk/templates/org.cishell.templates/src/org/cishell/templates/staticexecutable/StaticExecutableRunner.java 2009-09-05 23:45:29 UTC (rev 946)
@@ -106,7 +106,6 @@
tempDirPath = makeTempDirectory();
algDirPath = tempDirPath + File.separator + props.getProperty("Algorithm-Directory") + File.separator;
-
}
/**
@@ -194,15 +193,18 @@
}
}
- protected File[] executeProgram(String[] cmdarray, String baseDirPath) throws AlgorithmExecutionException {
- //remember which files were in the directory before we ran the program
+ protected File[] executeProgram(String[] commandArray, String baseDirPath) throws AlgorithmExecutionException {
+ /*
+ * Remember which files were in the directory before we ran
+ * the program.
+ */
File baseDir = new File(baseDirPath);
String[] beforeFiles = baseDir.list();
//create and run the executing process
Process process = null;
try {
- process = Runtime.getRuntime().exec(cmdarray, null, new File(baseDirPath));
+ process = Runtime.getRuntime().exec(commandArray, null, new File(baseDirPath));
process.getOutputStream().close();
} catch (IOException e1) {
throw new AlgorithmExecutionException(e1.getMessage(), e1);
@@ -440,13 +442,15 @@
str = str.replaceAll("\\$\\{executable\\}", props.getProperty("executable"));
for (int i = 0; i < data.length; i++) {
- String file = ((File) data[i].getData()).getAbsolutePath();
+ File inFile = (File)data[i].getData();
+ String filePath = inFile.getAbsolutePath();
+ System.err.println("inFile[" + i + "]: \"" + filePath + "\" exists: " + inFile.exists());
if (File.separatorChar == '\\') {
- file = file.replace(File.separatorChar, '/');
+ filePath = filePath.replace(File.separatorChar, '/');
}
- str = str.replaceAll("\\$\\{inFile\\[" + i + "\\]\\}", file);
+ str = str.replaceAll("\\$\\{inFile\\[" + i + "\\]\\}", filePath);
if (File.separatorChar == '\\') {
str = str.replace('/', File.separatorChar);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jrb...@us...> - 2009-09-04 21:08:36
|
Revision: 945
http://cishell.svn.sourceforge.net/cishell/?rev=945&view=rev
Author: jrbibers
Date: 2009-09-04 21:08:26 +0000 (Fri, 04 Sep 2009)
Log Message:
-----------
In the colored-region style, we now report when some region was requested to be painted a particular color, but no region of that name could be found in the shapefile. Previously, if a user gave the algorithm a table with a row specifying a country named "Russian Federation", there would be no warning that that data wasn't represented in the output map (as our current world countries shapefile has a "Russia" feature, but no "Russian Federation" feature). If any such failures occur, the user is now told how many occurred, the NWB user console shows at least a few of them, and the complete list is written to the log file.
Added two new implosion utilities in support of this.
Modified Paths:
--------------
trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayListUtilities.java
trunk/core/org.cishell.utilities/src/org/cishell/utilities/StringUtilities.java
Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayListUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayListUtilities.java 2009-09-03 19:47:28 UTC (rev 944)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayListUtilities.java 2009-09-04 21:08:26 UTC (rev 945)
@@ -2,6 +2,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
public class ArrayListUtilities {
public static ArrayList unionArrayLists(ArrayList arrayList1,
@@ -36,4 +37,68 @@
return union;
}
+
+ /* Implodes list to a String with the String.valueOf the elements separated
+ * by separator and where all elements except the first prefixSize and
+ * final suffixSize are represented only by ellipsis.
+ *
+ * Examples:
+ * - ({1, 2, 3, 4, 5, 6}, 2, 1, ", ", "...") returns "1, 2, ..., 5"
+ * - ({1, 2, 3, 4, 5, 6}, 7, 7, ", ", "...") returns "1, 2, 3"
+ * - ({1, 2, 3, 4, 5, 6}, 0, 2, ", ", "...") returns "1, 2, ..., 4, 5"
+ * - ({1, 2, 3, 4, 5, 6}, 2, 0, ", ", "...") returns "1, 2, ..."
+ * - ({1, 2, 3, 4, 5, 6}, -1, -1, ", ", "...") returns "1, 2, ..."
+ * - The empty list always returns "No elements"
+ *
+ * If requestedPrefixSize (resp. requestedSuffixSize) is less than
+ * prefixSizeMinimum (resp. suffixSizeMinimum), we instead use the minimum.
+ */
+ public static String makePreview(
+ List list,
+ int requestedPrefixSize,
+ int requestedSuffixSize,
+ String separator,
+ String ellipsis) {
+ if (list.isEmpty()) {
+ return "No elements";
+ } else {
+ // Adjust the requested sizes to reasonable numbers.
+ final int prefixSizeMinimum = 2;
+ requestedPrefixSize =
+ Math.max(prefixSizeMinimum, requestedPrefixSize);
+ final int suffixSizeMinimum = 0;
+ requestedSuffixSize =
+ Math.max(suffixSizeMinimum, requestedSuffixSize);
+
+ // Check whether an ellipsis is necessary.
+ boolean ellipsisNecessary =
+ (list.size() > requestedPrefixSize + requestedSuffixSize);
+ if (ellipsisNecessary) {
+ // Implode the prefix, ellipsis, and suffix.
+ List affixes = new ArrayList();
+
+ List prefixList = list.subList(0, requestedPrefixSize);
+ if (!prefixList.isEmpty()) {
+ affixes.add(
+ StringUtilities.implodeList(prefixList, separator));
+ }
+
+ affixes.add(ellipsis);
+
+ List suffixList =
+ list.subList(
+ list.size() - requestedSuffixSize,
+ list.size());
+ if (!suffixList.isEmpty()) {
+ affixes.add(
+ StringUtilities.implodeList(suffixList, separator));
+ }
+
+ return StringUtilities.implodeList(affixes, separator);
+ } else {
+ // Just implode the list.
+ return StringUtilities.implodeList(list, separator);
+ }
+ }
+ }
}
\ No newline at end of file
Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/StringUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/StringUtilities.java 2009-09-03 19:47:28 UTC (rev 944)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/StringUtilities.java 2009-09-04 21:08:26 UTC (rev 945)
@@ -1,5 +1,7 @@
package org.cishell.utilities;
+import java.util.List;
+
public class StringUtilities {
public static String implodeStringArray(String[] stringArray, String separator) {
final int stringArrayLength = stringArray.length;
@@ -14,4 +16,21 @@
return workingResultString.toString();
}
+
+ public static String implodeList(List list, String separator) {
+ StringBuffer workingResultString = new StringBuffer();
+
+ final int listLength = list.size();
+
+ for (int ii = 0; ii < listLength; ii++) {
+ workingResultString.append(list.get(ii));
+
+ boolean isLastElement = (ii == listLength - 1);
+ if (!isLastElement) {
+ workingResultString.append(separator);
+ }
+ }
+
+ return workingResultString.toString();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mwl...@us...> - 2009-09-03 19:47:45
|
Revision: 944
http://cishell.svn.sourceforge.net/cishell/?rev=944&view=rev
Author: mwlinnem
Date: 2009-09-03 19:47:28 +0000 (Thu, 03 Sep 2009)
Log Message:
-----------
Updated Jung library to 1.7.6 which fixes a visualization bug.
Modified Paths:
--------------
trunk/libs/edu.uci.ics.jung/.classpath
trunk/libs/edu.uci.ics.jung/META-INF/MANIFEST.MF
trunk/libs/edu.uci.ics.jung/build.properties
Added Paths:
-----------
trunk/libs/edu.uci.ics.jung/jung-1.7.6.jar
Removed Paths:
-------------
trunk/libs/edu.uci.ics.jung/jung-1.7.4.jar
Modified: trunk/libs/edu.uci.ics.jung/.classpath
===================================================================
--- trunk/libs/edu.uci.ics.jung/.classpath 2009-08-31 16:44:38 UTC (rev 943)
+++ trunk/libs/edu.uci.ics.jung/.classpath 2009-09-03 19:47:28 UTC (rev 944)
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry exported="true" kind="lib" path="jung-1.7.4.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry exported="true" kind="lib" path="jung-1.7.6.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: trunk/libs/edu.uci.ics.jung/META-INF/MANIFEST.MF
===================================================================
--- trunk/libs/edu.uci.ics.jung/META-INF/MANIFEST.MF 2009-08-31 16:44:38 UTC (rev 943)
+++ trunk/libs/edu.uci.ics.jung/META-INF/MANIFEST.MF 2009-09-03 19:47:28 UTC (rev 944)
@@ -2,8 +2,8 @@
Bundle-ManifestVersion: 2
Bundle-Name: Jung Plug-in
Bundle-SymbolicName: edu.uci.ics.jung
-Bundle-Version: 1.7.4
-Bundle-ClassPath: jung-1.7.4.jar
+Bundle-Version: 1.7.6
+Bundle-ClassPath: jung-1.7.6.jar
Export-Package: edu.uci.ics.jung.algorithms,
edu.uci.ics.jung.algorithms.blockmodel,
edu.uci.ics.jung.algorithms.cluster,
Modified: trunk/libs/edu.uci.ics.jung/build.properties
===================================================================
--- trunk/libs/edu.uci.ics.jung/build.properties 2009-08-31 16:44:38 UTC (rev 943)
+++ trunk/libs/edu.uci.ics.jung/build.properties 2009-09-03 19:47:28 UTC (rev 944)
@@ -1,2 +1,2 @@
bin.includes = META-INF/,\
- jung-1.7.4.jar
+ jung-1.7.6.jar
Deleted: trunk/libs/edu.uci.ics.jung/jung-1.7.4.jar
===================================================================
(Binary files differ)
Added: trunk/libs/edu.uci.ics.jung/jung-1.7.6.jar
===================================================================
(Binary files differ)
Property changes on: trunk/libs/edu.uci.ics.jung/jung-1.7.6.jar
___________________________________________________________________
Added: 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: <jrb...@us...> - 2009-08-31 16:44:47
|
Revision: 943
http://cishell.svn.sourceforge.net/cishell/?rev=943&view=rev
Author: jrbibers
Date: 2009-08-31 16:44:38 +0000 (Mon, 31 Aug 2009)
Log Message:
-----------
Removed debug prints
Modified Paths:
--------------
trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/DropdownMutator.java
trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/ObjectClassDefinitionTransformer.java
Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/DropdownMutator.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/DropdownMutator.java 2009-08-31 15:28:39 UTC (rev 942)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/DropdownMutator.java 2009-08-31 16:44:38 UTC (rev 943)
@@ -88,12 +88,6 @@
}
private static List swapToFront(List list, String target) {
- System.out.println("list is length " + list.size() + " and contains:");
- for (Iterator listIt = list.iterator(); listIt.hasNext();) {
- System.out.println(listIt.next());
-
- }
-
if (list.contains(target)) {
int targetIndex = list.indexOf(target);
Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/ObjectClassDefinitionTransformer.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/ObjectClassDefinitionTransformer.java 2009-08-31 15:28:39 UTC (rev 942)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/ObjectClassDefinitionTransformer.java 2009-08-31 16:44:38 UTC (rev 943)
@@ -25,22 +25,21 @@
AttributeDefinition[] oldADs =
oldOCD.getAttributeDefinitions(INCOMING_ATTRIBUTES_FILTER);
- for(int ii = 0; ii < oldADs.length; ii++) {
- newOCD.addAttributeDefinition(OUTGOING_ATTRIBUTES_FILTER,
- transformer.transform(oldADs[ii]));
+ for (int ii = 0; ii < oldADs.length; ii++) {
+ newOCD.addAttributeDefinition(
+ OUTGOING_ATTRIBUTES_FILTER,
+ transformer.transform(oldADs[ii]));
}
return newOCD;
}
- /* Convenience method for batching transformations.
- * TODO Untested
- */
+ // Convenience method for batching transformations.
public static ObjectClassDefinition transform(
ObjectClassDefinition ocd, List transformers) {
ObjectClassDefinition newOCD = ocd;
- for ( Iterator it = transformers.iterator(); it.hasNext(); ) {
+ for (Iterator it = transformers.iterator(); it.hasNext();) {
AttributeDefinitionTransformer transformer =
(AttributeDefinitionTransformer) it.next();
newOCD = apply(transformer, newOCD);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jrb...@us...> - 2009-08-31 15:28:48
|
Revision: 942
http://cishell.svn.sourceforge.net/cishell/?rev=942&view=rev
Author: jrbibers
Date: 2009-08-31 15:28:39 +0000 (Mon, 31 Aug 2009)
Log Message:
-----------
Fixed a small bug (treating ArrayList like an array)
Modified Paths:
--------------
trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/DropdownMutator.java
Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/DropdownMutator.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/DropdownMutator.java 2009-08-28 19:19:55 UTC (rev 941)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/DropdownMutator.java 2009-08-31 15:28:39 UTC (rev 942)
@@ -1,6 +1,7 @@
package org.cishell.utilities.mutateParameter;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import org.cishell.utilities.ArrayUtilities;
@@ -87,20 +88,24 @@
}
private static List swapToFront(List list, String target) {
+ System.out.println("list is length " + list.size() + " and contains:");
+ for (Iterator listIt = list.iterator(); listIt.hasNext();) {
+ System.out.println(listIt.next());
+
+ }
-
if (list.contains(target)) {
int targetIndex = list.indexOf(target);
List swappedList = new ArrayList(list.size());
- for (int ii = 0; ii < list.size(); ii++) {
- swappedList.set(ii, list.get(ii));
+ for (Iterator listIt = list.iterator(); listIt.hasNext();) {
+ swappedList.add(listIt.next());
}
-
+
swappedList.set(0, (String) list.get(targetIndex));
swappedList.set(targetIndex, (String) list.get(0));
-
+
return swappedList;
} else {
return list;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tan...@us...> - 2009-08-28 19:20:03
|
Revision: 941
http://cishell.svn.sourceforge.net/cishell/?rev=941&view=rev
Author: tankchintan
Date: 2009-08-28 19:19:55 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Initial import of the Streaming prototype plugin. Till now code developed by Russell, Micah, Joseph.
Added Paths:
-----------
trunk/testing/org.cishell.streaming.prototype/.classpath
trunk/testing/org.cishell.streaming.prototype/.project
trunk/testing/org.cishell.streaming.prototype/.settings/
trunk/testing/org.cishell.streaming.prototype/.settings/org.eclipse.pde.core.prefs
trunk/testing/org.cishell.streaming.prototype/META-INF/
trunk/testing/org.cishell.streaming.prototype/META-INF/MANIFEST.MF
trunk/testing/org.cishell.streaming.prototype/OSGI-INF/
trunk/testing/org.cishell.streaming.prototype/OSGI-INF/increasingnumberstream.properties
trunk/testing/org.cishell.streaming.prototype/OSGI-INF/increasingnumberstream.xml
trunk/testing/org.cishell.streaming.prototype/OSGI-INF/l10n/
trunk/testing/org.cishell.streaming.prototype/OSGI-INF/l10n/bundle_en.properties
trunk/testing/org.cishell.streaming.prototype/OSGI-INF/loggingconsumer.properties
trunk/testing/org.cishell.streaming.prototype/OSGI-INF/loggingconsumer.xml
trunk/testing/org.cishell.streaming.prototype/OSGI-INF/metatype/
trunk/testing/org.cishell.streaming.prototype/OSGI-INF/metatype/METADATA.XML
trunk/testing/org.cishell.streaming.prototype/OSGI-INF/printer.properties
trunk/testing/org.cishell.streaming.prototype/OSGI-INF/printer.xml
trunk/testing/org.cishell.streaming.prototype/OSGI-INF/streamer.properties
trunk/testing/org.cishell.streaming.prototype/OSGI-INF/streamer.xml
trunk/testing/org.cishell.streaming.prototype/build/
trunk/testing/org.cishell.streaming.prototype/build.properties
trunk/testing/org.cishell.streaming.prototype/src/
trunk/testing/org.cishell.streaming.prototype/src/org/
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/IncreasingNumberStreamAlgorithm.java
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/LoggingConsumerAlgorithm.java
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/Printer.java
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/PrinterFactory.java
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/RandomNumberStream.java
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/StreamerAlgorithm.java
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/StreamerFactory.java
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/ConsumerAlgorithm.java
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/DefaultStream.java
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/Stream.java
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/StreamAlgorithm.java
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamlib/
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamlib/Stream.java
trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamlib/StreamImpl.java
Added: trunk/testing/org.cishell.streaming.prototype/.classpath
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/.classpath (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/.classpath 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="build"/>
+</classpath>
Added: trunk/testing/org.cishell.streaming.prototype/.project
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/.project (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/.project 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.cishell.streaming.prototype</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/testing/org.cishell.streaming.prototype/.settings/org.eclipse.pde.core.prefs
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/.settings/org.eclipse.pde.core.prefs (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/.settings/org.eclipse.pde.core.prefs 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,5 @@
+#Thu Aug 27 13:26:25 EDT 2009
+eclipse.preferences.version=1
+pluginProject.equinox=false
+pluginProject.extensions=false
+resolve.requirebundle=false
Added: trunk/testing/org.cishell.streaming.prototype/META-INF/MANIFEST.MF
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/META-INF/MANIFEST.MF (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/META-INF/MANIFEST.MF 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Streaming Data Prototype
+Bundle-SymbolicName: org.cishell.streaming.prototype
+Bundle-Version: 0.0.1
+Bundle-ClassPath: .
+Import-Package: org.cishell.app.service.datamanager,
+ org.cishell.app.service.scheduler,
+ org.cishell.framework;version="1.0.0",
+ org.cishell.framework.algorithm;version="1.0.0",
+ org.cishell.framework.data;version="1.0.0",
+ org.cishell.framework.userprefs;version="1.0.0",
+ org.osgi.framework;version="1.3.0",
+ org.osgi.service.cm;version="1.2.0",
+ org.osgi.service.component;version="1.0.0",
+ org.osgi.service.log;version="1.3.0",
+ org.osgi.service.metatype;version="1.1.0",
+ org.osgi.service.prefs;version="1.1.0"
+X-AutoStart: true
+Service-Component: OSGI-INF/increasingnumberstream.xml, OSGI-INF/loggingconsumer.xml
Added: trunk/testing/org.cishell.streaming.prototype/OSGI-INF/increasingnumberstream.properties
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/OSGI-INF/increasingnumberstream.properties (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/OSGI-INF/increasingnumberstream.properties 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,7 @@
+menu_path=Streaming/start
+label=Streaming Data Prototype
+description=Stream data.
+in_data=null
+out_data=org.cishell.streaming.prototype.streamcore.Stream
+service.pid=org.cishell.streaming.prototype.IncreasingNumberStreamAlgorithm
+remoteable=true
Added: trunk/testing/org.cishell.streaming.prototype/OSGI-INF/increasingnumberstream.xml
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/OSGI-INF/increasingnumberstream.xml (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/OSGI-INF/increasingnumberstream.xml 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component name="org.cishell.streaming.prototype.IncreasingNumberStreamAlgorithm.component" immediate="false">
+ <implementation class="org.cishell.streaming.prototype.IncreasingNumberStreamAlgorithm$Factory"/>
+ <properties entry="OSGI-INF/increasingnumberstream.properties"/>
+
+ <service>
+ <provide interface=
+ "org.cishell.framework.algorithm.AlgorithmFactory"/>
+ </service>
+</component>
\ No newline at end of file
Added: trunk/testing/org.cishell.streaming.prototype/OSGI-INF/l10n/bundle_en.properties
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/OSGI-INF/l10n/bundle_en.properties (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/OSGI-INF/l10n/bundle_en.properties 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,7 @@
+#Localization variables for OSGI-INF/metatatype/METADATA.XML
+#
+#Samples:
+#input=Input
+#desc=Enter an integer (that will be converted to a string)
+#name=Input->String
+#name_desc=Converts inputted integer to string
Added: trunk/testing/org.cishell.streaming.prototype/OSGI-INF/loggingconsumer.properties
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/OSGI-INF/loggingconsumer.properties (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/OSGI-INF/loggingconsumer.properties 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,7 @@
+menu_path=Streaming/start
+label=Printing Data Prototype
+description=Print data.
+in_data=org.cishell.streaming.prototype.streamcore.Stream
+out_data=null
+service.pid=org.cishell.streaming.prototype.LoggingConsumerAlgorithm
+remoteable=true
Added: trunk/testing/org.cishell.streaming.prototype/OSGI-INF/loggingconsumer.xml
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/OSGI-INF/loggingconsumer.xml (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/OSGI-INF/loggingconsumer.xml 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component name="org.cishell.streaming.prototype.LoggingConsumerAlgorithm.component" immediate="false">
+ <implementation class="org.cishell.streaming.prototype.LoggingConsumerAlgorithm$Factory"/>
+ <properties entry="OSGI-INF/loggingconsumer.properties"/>
+
+ <service>
+ <provide interface=
+ "org.cishell.framework.algorithm.AlgorithmFactory"/>
+ </service>
+</component>
\ No newline at end of file
Added: trunk/testing/org.cishell.streaming.prototype/OSGI-INF/metatype/METADATA.XML
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/OSGI-INF/metatype/METADATA.XML (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/OSGI-INF/metatype/METADATA.XML 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0">
+ <OCD name="Streaming Data Prototype" id="org.cishell.streaming.prototype.Streamer.OCD"
+ description="Stream data. ">
+ </OCD>
+ <Designate pid="org.cishell.streaming.prototype.Streamer">
+ <Object ocdref="org.cishell.streaming.prototype.Streamer.OCD" />
+ </Designate>
+</metatype:MetaData>
Added: trunk/testing/org.cishell.streaming.prototype/OSGI-INF/printer.properties
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/OSGI-INF/printer.properties (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/OSGI-INF/printer.properties 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,7 @@
+menu_path=Streaming/start
+label=Printing Data Prototype
+description=Print data.
+out_data=null
+in_data=org.cishell.streaming.prototype.streamlib.Stream
+service.pid=org.cishell.streaming.prototype.Printer
+remoteable=true
Added: trunk/testing/org.cishell.streaming.prototype/OSGI-INF/printer.xml
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/OSGI-INF/printer.xml (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/OSGI-INF/printer.xml 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component name="org.cishell.streaming.prototype.Printer.component" immediate="false">
+ <implementation class="org.cishell.streaming.prototype.PrinterFactory"/>
+ <properties entry="OSGI-INF/printer.properties"/>
+
+ <service>
+ <provide interface=
+ "org.cishell.framework.algorithm.AlgorithmFactory"/>
+ </service>
+</component>
\ No newline at end of file
Added: trunk/testing/org.cishell.streaming.prototype/OSGI-INF/streamer.properties
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/OSGI-INF/streamer.properties (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/OSGI-INF/streamer.properties 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,7 @@
+menu_path=Streaming/start
+label=Streaming Data Prototype
+description=Stream data.
+in_data=null
+out_data=org.cishell.streaming.prototype.streamlib.Stream
+service.pid=org.cishell.streaming.prototype.Streamer
+remoteable=true
Added: trunk/testing/org.cishell.streaming.prototype/OSGI-INF/streamer.xml
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/OSGI-INF/streamer.xml (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/OSGI-INF/streamer.xml 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component name="org.cishell.streaming.prototype.Streamer.component" immediate="false">
+ <implementation class="org.cishell.streaming.prototype.StreamerFactory"/>
+ <properties entry="OSGI-INF/streamer.properties"/>
+
+ <service>
+ <provide interface=
+ "org.cishell.framework.algorithm.AlgorithmFactory"/>
+ </service>
+</component>
\ No newline at end of file
Added: trunk/testing/org.cishell.streaming.prototype/build.properties
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/build.properties (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/build.properties 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = build/
+bin.includes = META-INF/,\
+ .,\
+ OSGI-INF/
Added: trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/IncreasingNumberStreamAlgorithm.java
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/IncreasingNumberStreamAlgorithm.java (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/IncreasingNumberStreamAlgorithm.java 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,49 @@
+package org.cishell.streaming.prototype;
+
+import java.util.Dictionary;
+
+import org.cishell.framework.CIShellContext;
+import org.cishell.framework.algorithm.Algorithm;
+import org.cishell.framework.algorithm.AlgorithmFactory;
+import org.cishell.framework.data.Data;
+import org.cishell.streaming.prototype.streamcore.DefaultStream;
+import org.cishell.streaming.prototype.streamcore.Stream;
+import org.cishell.streaming.prototype.streamcore.StreamAlgorithm;
+
+public class IncreasingNumberStreamAlgorithm extends StreamAlgorithm<Integer> {
+ @SuppressWarnings("unchecked") // TODO
+ public IncreasingNumberStreamAlgorithm(Data[] data, Dictionary parameters,
+ CIShellContext context) {
+ super(data, parameters, context);
+ }
+
+ @Override
+ protected Stream<Integer> createStream() {
+ return new IncreasingNumberStream();
+ }
+
+ private class IncreasingNumberStream extends DefaultStream<Integer> {
+ public static final int MAX_EMISSIONS = 20;
+
+ private int numEmissions = 0;
+
+ public Integer next() {
+ // TODO Debug only
+ System.out.println("About to produce " + (numEmissions));
+ return numEmissions++;
+ }
+
+ public boolean isFinished() {
+ return numEmissions == MAX_EMISSIONS;
+ }
+ }
+
+ public static class Factory implements AlgorithmFactory {
+ @SuppressWarnings("unchecked") // TODO
+ public Algorithm createAlgorithm(Data[] data, Dictionary parameters,
+ CIShellContext context) {
+ return new IncreasingNumberStreamAlgorithm(
+ data, parameters, context);
+ }
+ }
+}
Added: trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/LoggingConsumerAlgorithm.java
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/LoggingConsumerAlgorithm.java (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/LoggingConsumerAlgorithm.java 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,39 @@
+package org.cishell.streaming.prototype;
+
+import java.util.Dictionary;
+
+import org.cishell.framework.CIShellContext;
+import org.cishell.framework.algorithm.Algorithm;
+import org.cishell.framework.algorithm.AlgorithmFactory;
+import org.cishell.framework.data.Data;
+import org.cishell.streaming.prototype.streamcore.ConsumerAlgorithm;
+import org.osgi.service.log.LogService;
+
+public class LoggingConsumerAlgorithm extends ConsumerAlgorithm<Object> {
+ private LogService logger;
+
+
+ @SuppressWarnings("unchecked") // TODO
+ public LoggingConsumerAlgorithm(
+ Data[] data, Dictionary parameters, CIShellContext context) {
+ super(data, parameters, context);
+
+ this.logger =
+ (LogService) context.getService(LogService.class.getName());
+ }
+
+
+ @Override
+ public void consume(Object value) {
+ logger.log(LogService.LOG_INFO, "Consuming " + value);
+ }
+
+
+ public static class Factory implements AlgorithmFactory {
+ @SuppressWarnings("unchecked") // TODO
+ public Algorithm createAlgorithm(
+ Data[] data, Dictionary parameters, CIShellContext context) {
+ return new LoggingConsumerAlgorithm(data, parameters, context);
+ }
+ }
+}
Added: trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/Printer.java
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/Printer.java (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/Printer.java 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,38 @@
+package org.cishell.streaming.prototype;
+
+import java.util.Dictionary;
+
+import org.cishell.framework.CIShellContext;
+import org.cishell.framework.algorithm.Algorithm;
+import org.cishell.framework.algorithm.AlgorithmExecutionException;
+import org.cishell.framework.data.Data;
+import org.cishell.streaming.prototype.streamlib.Stream;
+import org.osgi.service.log.LogService;
+
+public class Printer implements Algorithm {
+
+ private Stream<String> stream;
+ private LogService logger;
+
+
+ public Printer(Data[] data, Dictionary parameters, CIShellContext context) {
+ this.stream = (Stream<String>) data[0].getData();
+ this.logger = (LogService) context.getService(LogService.class.getName());
+ }
+
+ public Data[] execute() throws AlgorithmExecutionException {
+
+ int nextToPrint = 0;
+ while(!stream.isFinalEndpoint(nextToPrint)) {
+ int endpoint = stream.getCurrentEndpoint();
+ for(int ii = nextToPrint; ii < endpoint; ii++) {
+ logger.log(LogService.LOG_INFO, "Received: " + stream.getValueAtTimestep(ii));
+ }
+ nextToPrint = endpoint;
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {}
+ }
+ return null;
+ }
+}
\ No newline at end of file
Added: trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/PrinterFactory.java
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/PrinterFactory.java (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/PrinterFactory.java 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,14 @@
+package org.cishell.streaming.prototype;
+
+import java.util.Dictionary;
+
+import org.cishell.framework.CIShellContext;
+import org.cishell.framework.algorithm.Algorithm;
+import org.cishell.framework.algorithm.AlgorithmFactory;
+import org.cishell.framework.data.Data;
+
+public class PrinterFactory implements AlgorithmFactory {
+ public Algorithm createAlgorithm(Data[] data, Dictionary parameters, CIShellContext context) {
+ return new Printer(data, parameters, context);
+ }
+}
\ No newline at end of file
Added: trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/RandomNumberStream.java
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/RandomNumberStream.java (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/RandomNumberStream.java 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,19 @@
+package org.cishell.streaming.prototype;
+
+import org.cishell.streaming.prototype.streamlib.StreamImpl;
+
+public class RandomNumberStream extends StreamImpl<String> {
+
+ public static final int MAX_EMISSIONS = 20;
+
+ private int numEmissions = 0;
+
+ public String yield() {
+ numEmissions++;
+ return "Generated " + Math.random() + " | Time step ID: " + numEmissions;
+ }
+
+ public boolean isFinished() {
+ return numEmissions == MAX_EMISSIONS;
+ }
+}
Added: trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/StreamerAlgorithm.java
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/StreamerAlgorithm.java (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/StreamerAlgorithm.java 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,28 @@
+package org.cishell.streaming.prototype;
+
+import java.util.Dictionary;
+
+import org.cishell.framework.CIShellContext;
+import org.cishell.framework.algorithm.Algorithm;
+import org.cishell.framework.algorithm.AlgorithmExecutionException;
+import org.cishell.framework.data.BasicData;
+import org.cishell.framework.data.Data;
+import org.cishell.streaming.prototype.streamlib.StreamImpl;
+
+public class StreamerAlgorithm implements Algorithm {
+ private Data[] data;
+ private Dictionary parameters;
+ private CIShellContext context;
+
+ public StreamerAlgorithm(Data[] data, Dictionary parameters, CIShellContext context) {
+ this.data = data;
+ this.parameters = parameters;
+ this.context = context;
+ }
+
+ public Data[] execute() throws AlgorithmExecutionException {
+ Data[] output = new Data[]{new BasicData(new RandomNumberStream(), StreamImpl.class.getName())};
+
+ return output;
+ }
+}
\ No newline at end of file
Added: trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/StreamerFactory.java
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/StreamerFactory.java (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/StreamerFactory.java 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,14 @@
+package org.cishell.streaming.prototype;
+
+import java.util.Dictionary;
+
+import org.cishell.framework.CIShellContext;
+import org.cishell.framework.algorithm.Algorithm;
+import org.cishell.framework.algorithm.AlgorithmFactory;
+import org.cishell.framework.data.Data;
+
+public class StreamerFactory implements AlgorithmFactory {
+ public Algorithm createAlgorithm(Data[] data, Dictionary parameters, CIShellContext context) {
+ return new StreamerAlgorithm(data, parameters, context);
+ }
+}
\ No newline at end of file
Added: trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/ConsumerAlgorithm.java
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/ConsumerAlgorithm.java (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/ConsumerAlgorithm.java 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,47 @@
+package org.cishell.streaming.prototype.streamcore;
+
+import java.util.Dictionary;
+
+import org.cishell.framework.CIShellContext;
+import org.cishell.framework.algorithm.Algorithm;
+import org.cishell.framework.algorithm.AlgorithmExecutionException;
+import org.cishell.framework.data.Data;
+
+public abstract class ConsumerAlgorithm<T> implements Algorithm {
+ private Stream<T> stream;
+
+
+ @SuppressWarnings("unchecked") // TODO
+ public ConsumerAlgorithm(Data[] data, Dictionary parameters,
+ CIShellContext context) {
+ this.stream = (Stream<T>) data[0].getData();
+ }
+
+
+ public Data[] execute() throws AlgorithmExecutionException {
+ int nextToPrint = 0;
+
+ while (!stream.isFinalEndpoint(nextToPrint)) {
+ int endpoint = stream.getCurrentEndpoint();
+
+ for (int ii = nextToPrint; ii < endpoint; ii++) {
+ // TODO Debug only
+ System.out.println("About to consume "
+ + stream.getValueAtTimestep(ii)
+ + " from timestep "
+ + ii);
+ consume(stream.getValueAtTimestep(ii));
+ }
+
+ nextToPrint = endpoint;
+
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {}
+ }
+
+ return null;
+ }
+
+ public abstract void consume(T value);
+}
\ No newline at end of file
Added: trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/DefaultStream.java
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/DefaultStream.java (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/DefaultStream.java 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,85 @@
+package org.cishell.streaming.prototype.streamcore;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public abstract class DefaultStream<T> implements Stream<T> {
+ private static final long DEFAULT_SLEEP_TIME = 1000;
+
+ private List<T> dataList =
+ Collections.synchronizedList(new ArrayList<T>());
+ private Thread streamingThread;
+
+ private boolean paused;
+
+ private boolean stopped;
+
+
+ public DefaultStream() {
+ this(DEFAULT_SLEEP_TIME);
+ }
+
+ public DefaultStream(final long sleepTime) {
+ this.streamingThread = new Thread(new Runnable() {
+ public void run() {
+ while(!isStopped() && !isFinished()) {
+ while (isPaused()) {
+ // TODO Debug only
+ System.out.println("Still paused!");
+ try {
+ Thread.sleep(sleepTime);
+ } catch (InterruptedException e) {}
+ }
+
+ dataList.add(next());
+
+ try {
+ Thread.sleep(sleepTime);
+ } catch (InterruptedException e) {}
+ }
+ }
+ });
+
+ streamingThread.start();
+ }
+
+ public void pause() {
+ setPaused(true);
+ }
+ public void unpause() {
+ setPaused(false);
+ }
+ public boolean isPaused() {
+ return paused;
+ }
+ public void setPaused(boolean paused) {
+ this.paused = paused;
+ }
+
+ public void stop() {
+ setStopped(true);
+ }
+ public boolean isStopped() {
+ return stopped;
+ }
+ public void setStopped(boolean stopped) {
+ this.stopped = stopped;
+ }
+
+ public abstract boolean isFinished();
+
+
+ public int getCurrentEndpoint() {
+ return dataList.size();
+ }
+
+ public T getValueAtTimestep(int timestep) {
+ return dataList.get(timestep);
+ }
+
+ public boolean isFinalEndpoint(int candidateEndpoint) {
+ return ((!streamingThread.isAlive())
+ && (candidateEndpoint == getCurrentEndpoint()));
+ }
+}
Added: trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/Stream.java
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/Stream.java (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/Stream.java 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,12 @@
+package org.cishell.streaming.prototype.streamcore;
+
+public interface Stream<T> {
+ public T next();
+ public void pause();
+ public void unpause();
+ public void stop();
+
+ public int getCurrentEndpoint();
+ public T getValueAtTimestep(int timestep);
+ public boolean isFinalEndpoint(int candidateEndpoint);
+}
Added: trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/StreamAlgorithm.java
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/StreamAlgorithm.java (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamcore/StreamAlgorithm.java 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,79 @@
+package org.cishell.streaming.prototype.streamcore;
+
+import java.util.Calendar;
+import java.util.Dictionary;
+
+import org.cishell.app.service.datamanager.DataManagerListener;
+import org.cishell.app.service.datamanager.DataManagerService;
+import org.cishell.app.service.scheduler.SchedulerListener;
+import org.cishell.app.service.scheduler.SchedulerService;
+import org.cishell.framework.CIShellContext;
+import org.cishell.framework.algorithm.Algorithm;
+import org.cishell.framework.algorithm.AlgorithmExecutionException;
+import org.cishell.framework.data.BasicData;
+import org.cishell.framework.data.Data;
+
+public abstract class StreamAlgorithm<T>
+ implements Algorithm, DataManagerListener, SchedulerListener {
+ private Data outStreamContainer;
+ private Stream<T> stream;
+ private DataManagerService dataManager;
+ private SchedulerService scheduler;
+
+ @SuppressWarnings("unchecked")
+ public StreamAlgorithm(
+ Data[] data, Dictionary parameters, CIShellContext context) {
+ this.dataManager =
+ (DataManagerService) context.getService(
+ DataManagerService.class.getName());
+ dataManager.addDataManagerListener(this);
+
+ this.scheduler =
+ (SchedulerService) context.getService(
+ SchedulerService.class.getName());
+ scheduler.addSchedulerListener(this);
+ }
+
+
+ public Data[] execute() throws AlgorithmExecutionException {
+ this.stream = createStream();
+ this.outStreamContainer =
+ new BasicData(stream, Stream.class.getName());
+ return new Data[]{ outStreamContainer };
+ }
+
+ protected abstract Stream<T> createStream();
+
+
+ // *** DataManagerListener (TODO: Implement as appropriate)
+ public void dataAdded(Data data, String label) {}
+ public void dataLabelChanged(Data data, String label) {}
+ public void dataSelected(Data[] data) {}
+ public void dataRemoved(Data data) {
+ if (outStreamContainer.equals(data)) {
+ stream.stop();
+ dataManager.removeDataManagerListener(this);
+ scheduler.removeSchedulerListener(this);
+ }
+ }
+ // *** DataManagerListener (TODO: Implement as appropriate)
+
+
+ // *** SchedulerListener (TODO: Implement as appropriate)
+ public void algorithmScheduled(Algorithm algorithm, Calendar time) {}
+ public void algorithmRescheduled(Algorithm algorithm, Calendar time) {}
+ public void algorithmUnscheduled(Algorithm algorithm) {}
+ public void algorithmStarted(Algorithm algorithm) {}
+ public void algorithmFinished(Algorithm algorithm, Data[] createdData) {}
+ public void algorithmError(Algorithm algorithm, Throwable error) {}
+ public void schedulerRunStateChanged(boolean isRunning) {
+ System.out.println("Scheduler run state changed!");
+ if (isRunning) {
+ stream.unpause();
+ } else {
+ stream.pause();
+ }
+ }
+ public void schedulerCleared() {}
+ // *** SchedulerListener (TODO: Implement as appropriate)
+}
\ No newline at end of file
Added: trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamlib/Stream.java
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamlib/Stream.java (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamlib/Stream.java 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,11 @@
+package org.cishell.streaming.prototype.streamlib;
+
+public interface Stream<T> {
+
+ public abstract int getCurrentEndpoint();
+
+ public abstract T getValueAtTimestep(int timestep);
+
+ public abstract boolean isFinalEndpoint(int candidateEndpoint);
+
+}
Added: trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamlib/StreamImpl.java
===================================================================
--- trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamlib/StreamImpl.java (rev 0)
+++ trunk/testing/org.cishell.streaming.prototype/src/org/cishell/streaming/prototype/streamlib/StreamImpl.java 2009-08-28 19:19:55 UTC (rev 941)
@@ -0,0 +1,57 @@
+package org.cishell.streaming.prototype.streamlib;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public abstract class StreamImpl<T> implements Stream<T> {
+
+ private static final long DEFAULT_SLEEP_TIME = 1000;
+
+ private List<T> streamingList = Collections.synchronizedList(new ArrayList<T>());
+ private Thread streamingThread;
+
+ public StreamImpl() {
+ this(DEFAULT_SLEEP_TIME);
+ }
+
+ public StreamImpl(final long sleepTime) {
+ this.streamingThread = new Thread(new Runnable(){
+ public void run() {
+ while(! StreamImpl.this.isFinished()) {
+ StreamImpl.this.streamingList.add(StreamImpl.this.yield());
+ try {
+ Thread.sleep(sleepTime);
+ } catch (InterruptedException e) {}
+ }
+ }
+ });
+
+ streamingThread.start();
+ }
+
+
+ public abstract boolean isFinished();
+ public abstract T yield();
+
+ /* (non-Javadoc)
+ * @see org.cishell.streaming.prototype.streamlib.Streamo#getCurrentEndpoint()
+ */
+ public int getCurrentEndpoint() {
+ return streamingList.size();
+ }
+
+ /* (non-Javadoc)
+ * @see org.cishell.streaming.prototype.streamlib.Streamo#getValueAtTimestep(int)
+ */
+ public T getValueAtTimestep(int timestep) {
+ return streamingList.get(timestep);
+ }
+
+ /* (non-Javadoc)
+ * @see org.cishell.streaming.prototype.streamlib.Streamo#isFinalEndpoint(int)
+ */
+ public boolean isFinalEndpoint(int candidateEndpoint) {
+ return !streamingThread.isAlive() && candidateEndpoint == getCurrentEndpoint();
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tan...@us...> - 2009-08-28 19:18:55
|
Revision: 940
http://cishell.svn.sourceforge.net/cishell/?rev=940&view=rev
Author: tankchintan
Date: 2009-08-28 19:18:38 +0000 (Fri, 28 Aug 2009)
Log Message:
-----------
Initial import.
Added Paths:
-----------
trunk/testing/org.cishell.streaming.prototype/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-08-26 17:46:28
|
Revision: 939
http://cishell.svn.sourceforge.net/cishell/?rev=939&view=rev
Author: pataphil
Date: 2009-08-26 17:46:10 +0000 (Wed, 26 Aug 2009)
Log Message:
-----------
The previous "fix" broke stuff, so I changed it back.
Modified Paths:
--------------
trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/config.properties
Modified: trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/config.properties
===================================================================
--- trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/config.properties 2009-08-25 19:45:26 UTC (rev 938)
+++ trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/config.properties 2009-08-26 17:46:10 UTC (rev 939)
@@ -1,3 +1,3 @@
executable=$executableName$
-template="$${executable}" $templateString$
+template=$${executable} $templateString$
$outFiles$
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-08-25 19:45:35
|
Revision: 938
http://cishell.svn.sourceforge.net/cishell/?rev=938&view=rev
Author: pataphil
Date: 2009-08-25 19:45:26 +0000 (Tue, 25 Aug 2009)
Log Message:
-----------
* Fixed a minor file path issue (changed back slashes to forward slashes).
Modified Paths:
--------------
trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/AbstractDialog.java
trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/DirectoryComponent.java
trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java
trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/LabelingComponent.java
trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/StringComponent.java
Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/AbstractDialog.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/AbstractDialog.java 2009-08-25 18:31:48 UTC (rev 937)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/AbstractDialog.java 2009-08-25 19:45:26 UTC (rev 938)
@@ -196,7 +196,7 @@
}
/**
- * Sets the Description of this AbstractDialog. This is the text that is displayed in the
+ * Sets the Description of this AbstractDialog. This is the textField that is displayed in the
* top section of the Dialog window, giving information about the question that is being
* asked or the information that is being given.
*
@@ -207,7 +207,7 @@
}
/**
- * Sets the details text of this AbstractDialog. This is the text that is displayed in the lower
+ * Sets the details textField of this AbstractDialog. This is the textField that is displayed in the lower
* section of the Dialog window when the user presses the "Details >>" button. If this String
* is null or the empty string, the details button will be disabled.
*
@@ -338,7 +338,7 @@
}
/*
- * creates the details text box when the "Details >>" button is toggled
+ * creates the details textField box when the "Details >>" button is toggled
*/
private void setupDetails() {
detailsText = new Text(shell, SWT.BORDER | SWT.WRAP | SWT.V_SCROLL);
@@ -357,9 +357,9 @@
* Open a standard error dialog with OK button
*
* @param parent the parent Shell of this dialog
- * @param title the text to display in the title bar of this dialog
+ * @param title the textField to display in the title bar of this dialog
* @param message the message to give in the dialog's body
- * @param details the text to put in the details pane to be visible when the
+ * @param details the textField to put in the details pane to be visible when the
* "Details >>" button is pressed (can be null or empty, resulting
* in the "Details >>" button not being enabled)
* @return true if the dialog was exited by pressing the OK button, false
@@ -373,9 +373,9 @@
* Open a standard information dialog with OK button
*
* @param parent the parent Shell of this dialog
- * @param title the text to display in the title bar of this dialog
+ * @param title the textField to display in the title bar of this dialog
* @param message the message to give in the dialog's body
- * @param details the text to put in the details pane to be visible when the
+ * @param details the textField to put in the details pane to be visible when the
* "Details >>" button is pressed (can be null or empty, resulting
* in the "Details >>" button not being enabled) * @return true if the dialog was exited by pressing the OK button, false
* if it was cancelled by pressing the 'x' in the title bar
@@ -388,9 +388,9 @@
* Open a standard warning dialog with OK button
*
* @param parent the parent Shell of this dialog
- * @param title the text to display in the title bar of this dialog
+ * @param title the textField to display in the title bar of this dialog
* @param message the message to give in the dialog's body
- * @param details the text to put in the details pane to be visible when the
+ * @param details the textField to put in the details pane to be visible when the
* "Details >>" button is pressed (can be null or empty, resulting
* in the "Details >>" button not being enabled) * @return true if the dialog was exited by pressing the OK button, false
* if it was cancelled by pressing the 'x' in the title bar
@@ -403,9 +403,9 @@
* Open a standard question dialog with Yes/No buttons
*
* @param parent the parent Shell of this dialog
- * @param title the text to display in the title bar of this dialog
+ * @param title the textField to display in the title bar of this dialog
* @param message the message to give in the dialog's body
- * @param details the text to put in the details pane to be visible when the
+ * @param details the textField to put in the details pane to be visible when the
* "Details >>" button is pressed (can be null or empty, resulting
* in the "Details >>" button not being enabled) * @return true if the dialog was exited by pressing the OK button, false
* if it was cancelled by pressing the 'x' in the title bar or pressing the
@@ -419,9 +419,9 @@
* Open a standard confirmation dialog with OK/Cancel buttons
*
* @param parent the parent Shell of this dialog
- * @param title the text to display in the title bar of this dialog
+ * @param title the textField to display in the title bar of this dialog
* @param message the message to give in the dialog's body
- * @param details the text to put in the details pane to be visible when the
+ * @param details the textField to put in the details pane to be visible when the
* "Details >>" button is pressed (can be null or empty, resulting
* in the "Details >>" button not being enabled) * @return true if the dialog was exited by pressing the OK button, false
* if it was cancelled by pressing the 'x' in the title bar or pressing
Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/DirectoryComponent.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/DirectoryComponent.java 2009-08-25 18:31:48 UTC (rev 937)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/DirectoryComponent.java 2009-08-25 19:45:26 UTC (rev 938)
@@ -21,11 +21,13 @@
public class DirectoryComponent extends FileComponent {
protected String getFile(String defaultPath) {
- DirectoryDialog dialog = new DirectoryDialog(text.getShell(), SWT.OPEN);
- dialog.setText("Select a Directory");
- dialog.setFilterPath(defaultPath);
-
- return dialog.open();
+ DirectoryDialog directorySelectorDialog =
+ new DirectoryDialog(textField.getShell(), SWT.OPEN);
+ directorySelectorDialog.setText("Select a Directory");
+ directorySelectorDialog.setFilterPath(defaultPath);
+ String chosenDirectoryPath = directorySelectorDialog.open();
+
+ return fixPath(chosenDirectoryPath);
}
protected String validate(File file) {
Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java 2009-08-25 18:31:48 UTC (rev 937)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/FileComponent.java 2009-08-25 19:45:26 UTC (rev 938)
@@ -16,6 +16,8 @@
import java.io.File;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
@@ -25,7 +27,7 @@
import org.eclipse.swt.widgets.FileDialog;
public class FileComponent extends StringComponent {
- protected Button browse;
+ protected Button browseButton;
private static Object currentValue;
public FileComponent() {
@@ -37,29 +39,34 @@
}
public Control createGUI(Composite parent, int style) {
- super.createGUI(parent, style); //creates the text component
+ // Creates the textField component.
+ super.createGUI(parent, style);
- Object data = text.getLayoutData();
- if (data != null && data instanceof GridData) {
- GridData gd = (GridData) data;
- gd.horizontalSpan--; //make room for the browse button
+ Object layoutData = this.textField.getLayoutData();
+
+ if (layoutData != null && layoutData instanceof GridData) {
+ GridData gridData = (GridData)layoutData;
+ gridData.horizontalSpan--;//make room for the browseButton button
}
- browse = new Button(parent, SWT.PUSH);
- browse.setText("Browse");
- //when click "Browse", here is the listener
- browse.addSelectionListener(new SelectionAdapter() {
+ this.browseButton = new Button(parent, SWT.PUSH);
+ this.browseButton.setText("Browse");
+
+ // When click "Browse", here is the listener.
+ browseButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
- String fileName = getFile(text.getText());
- //remember this new file/directory selection
- currentValue = fileName;
+ String fileName = getFile(textField.getText());
+
+ // Remember this new file/directory selection.
+ currentValue = fixPath(fileName);
+
if (fileName != null) {
- text.setText(fileName);
+ textField.setText(fileName);
update();
}
}});
- return text;
+ return this.textField;
}
/**
@@ -68,11 +75,13 @@
* @return the file they chose
*/
protected String getFile(String defaultPath) {
- FileDialog dialog = new FileDialog(text.getShell(), SWT.OPEN);
- dialog.setText("Select a File");
- dialog.setFilterPath(defaultPath);
-
- return dialog.open();
+ FileDialog fileSelectorDialog =
+ new FileDialog(textField.getShell(), SWT.OPEN);
+ fileSelectorDialog.setText("Select a File");
+ fileSelectorDialog.setFilterPath(defaultPath);
+ String chosenFilePath = fileSelectorDialog.open();
+
+ return fixPath(chosenFilePath);
}
protected String validate(File file) {
@@ -84,7 +93,7 @@
}
public String validate() {
- File file = new File(text.getText());
+ File file = new File(textField.getText());
String valid = validate(file);
if (valid.length() > 0) { //length > 0 means an error
@@ -98,6 +107,10 @@
return "file:";
}
+ public Object getValue() {
+ return fixPath(super.getValue().toString());
+ }
+
public void setValue(Object value) {
if (value != null && value.toString().equals(getKeyword())) {
@@ -114,6 +127,16 @@
}
- super.setValue(value);
+ super.setValue(fixPath(value.toString()));
}
+
+ public static String fixPath(String path) {
+ if (path != null) {
+ String fixedPath = path.replace('\\', '/');
+
+ return fixedPath;
+ } else {
+ return null;
+ }
+ }
}
Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/LabelingComponent.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/LabelingComponent.java 2009-08-25 18:31:48 UTC (rev 937)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/LabelingComponent.java 2009-08-25 19:45:26 UTC (rev 938)
@@ -155,7 +155,7 @@
/*
* Creation of a new description shell, which is a hover containing the
- * description text.
+ * description textField.
*/
this.descriptionShell = createDescriptionShell(descText, descriptionButton);
Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/StringComponent.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/StringComponent.java 2009-08-25 18:31:48 UTC (rev 937)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/StringComponent.java 2009-08-25 19:45:26 UTC (rev 938)
@@ -31,7 +31,7 @@
* @author Bruce Herr (bh...@bh...)
*/
public class StringComponent extends AbstractComponent {
- protected Text text;
+ protected Text textField;
protected Combo combo;
protected String[] optionValues;
@@ -48,7 +48,6 @@
GridData gd = new GridData(SWT.FILL,SWT.CENTER,true,false);
gd.horizontalSpan = MAX_SPAN-1;
gd.minimumWidth = 100;
-
optionValues = attr.getOptionValues();
if(optionValues != null) {
combo = new Combo(parent, style | SWT.DROP_DOWN | SWT.READ_ONLY);
@@ -72,23 +71,23 @@
return combo;
} else {
- text = new Text(parent, style | SWT.BORDER);
- text.setLayoutData(gd);
+ textField = new Text(parent, style | SWT.BORDER);
+ textField.setLayoutData(gd);
- text.addModifyListener(new ModifyListener() {
+ textField.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
update();
}
});
- return text;
+ return textField;
}
}
public Object getValue() {
Object value;
if(combo == null) {
- value = StringConverter.getInstance().stringToObject(attr, text.getText());
+ value = StringConverter.getInstance().stringToObject(attr, textField.getText());
} else {
value = StringConverter.getInstance().stringToObject(attr, getListValue());
}
@@ -109,15 +108,15 @@
return "Invalid basic value";
}
if(combo == null) {
- return attr.validate(text.getText());
+ return attr.validate(textField.getText());
} else {
return attr.validate(getListValue());
}
}
public void setValue(Object value) {
- if (text != null) {
- text.setText(value == null ? "" : value.toString());
+ if (textField != null) {
+ textField.setText(value == null ? "" : value.toString());
} else if (combo != null) {
int setComboToIndex = -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-08-25 18:32:23
|
Revision: 937
http://cishell.svn.sourceforge.net/cishell/?rev=937&view=rev
Author: pataphil
Date: 2009-08-25 18:31:48 +0000 (Tue, 25 Aug 2009)
Log Message:
-----------
Added appropriate quotes to the template string in the project template. Template.
Modified Paths:
--------------
trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/config.properties
Modified: trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/config.properties
===================================================================
--- trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/config.properties 2009-08-24 17:27:23 UTC (rev 936)
+++ trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/config.properties 2009-08-25 18:31:48 UTC (rev 937)
@@ -1,3 +1,3 @@
executable=$executableName$
-template=$${executable} $templateString$
+template="$${executable}" $templateString$
$outFiles$
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-08-24 17:27:30
|
Revision: 936
http://cishell.svn.sourceforge.net/cishell/?rev=936&view=rev
Author: pataphil
Date: 2009-08-24 17:27:23 +0000 (Mon, 24 Aug 2009)
Log Message:
-----------
* Added workaround for crazy File.listFiles bug (where empty directories were not in the listing).
Modified Paths:
--------------
trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/BasicTemplate.java
Added Paths:
-----------
trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/default/!PLACEHOLDER!
trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/linux.x86/!PLACEHOLDER!
trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/linux.x86_64/!PLACEHOLDER!
trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/macosx.ppc/!PLACEHOLDER!
trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/macosx.x86/!PLACEHOLDER!
trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/solaris.sparc/!PLACEHOLDER!
trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/ALGORITHM/win32/!PLACEHOLDER!
trunk/templates/org.cishell.templates.wizards/templates_3.0/static_executable/src/!PLACEHOLDER!
Modified: trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/BasicTemplate.java
===================================================================
--- trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/BasicTemplate.java 2009-08-22 14:39:16 UTC (rev 935)
+++ trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/BasicTemplate.java 2009-08-24 17:27:23 UTC (rev 936)
@@ -48,6 +48,12 @@
// TODO Could we safely reduce some of the method visibilities here?
public abstract class BasicTemplate extends OptionTemplateSection {
+ /*
+ * TODO: This is a hack to fix a bug where File seems to exclude empty
+ * directories from its list of sub files on certain platforms.
+ */
+ public static final String HACK_PLACEHOLDER_FILE_NAME = "!PLACEHOLDER!";
+
protected final String sectionID;
protected Map valueMap;
protected Map optionMap;
@@ -145,7 +151,7 @@
}
protected void generateFiles(IProgressMonitor progressMonitor,
- URL locationURL) throws CoreException {
+ URL locationURL) throws CoreException {
progressMonitor.setTaskName(
PDEUIMessages.AbstractTemplateSection_generating);
@@ -172,12 +178,12 @@
return;
}
- generateFiles(templateDirectory,
- project,
- true,
- false,
- true,
- progressMonitor);
+ generateFilesFromDirectory(templateDirectory,
+ project,
+ true,
+ false,
+ true,
+ progressMonitor);
} else if ("jar".equals(resolvedLocationURLProtocol)) {
int exclamationIndex = resolvedLocationURLFileName.indexOf('!');
@@ -209,12 +215,12 @@
try {
zipFile = new ZipFile(pluginJarFile);
- generateFiles(zipFile,
- templateDirectoryPath,
- project,
- true,
- false,
- progressMonitor);
+ generateFilesFromZipFile(zipFile,
+ templateDirectoryPath,
+ project,
+ true,
+ false,
+ progressMonitor);
} catch (ZipException zipException) {
} catch (IOException ioException1) {
} finally {
@@ -228,11 +234,11 @@
}
- progressMonitor.subTask(""); //$NON-NLS-1$
+ progressMonitor.subTask("");
progressMonitor.worked(1);
}
- protected void generateFiles(
+ protected void generateFilesFromDirectory(
File sourceFile,
IContainer destinationContainer,
boolean isFirstLevel,
@@ -244,6 +250,11 @@
for (int ii = 0; ii < sourceSubFiles.length; ii++) {
File sourceSubFile = sourceSubFiles[ii];
+ if (sourceSubFiles[ii].getName().equals(
+ HACK_PLACEHOLDER_FILE_NAME)) {
+ continue;
+ }
+
boolean shouldProcessSubFileAsTemplate =
shouldProcessAsTemplate && shouldProcessFile(sourceSubFile);
@@ -269,7 +280,7 @@
}
if (subDestinationContainer == null) {
- if (isOkToCreateFolder(sourceSubFile) == false) {
+ if (!isOkToCreateFolder(sourceSubFile)) {
continue;
}
@@ -292,12 +303,12 @@
true, true, progressMonitor);
}
- generateFiles(sourceSubFile,
- subDestinationContainer,
- false,
- isBinaryFile,
- shouldProcessSubFileAsTemplate,
- progressMonitor);
+ generateFilesFromDirectory(sourceSubFile,
+ subDestinationContainer,
+ false,
+ isBinaryFile,
+ shouldProcessSubFileAsTemplate,
+ progressMonitor);
} else {
if (isOkToCreateFile(sourceSubFile)) {
if (isFirstLevel) {
@@ -328,7 +339,7 @@
}
}
- protected void generateFiles(
+ protected void generateFilesFromZipFile(
ZipFile zipFile,
IPath filePath,
IContainer destinationContainer,
@@ -407,7 +418,7 @@
true, true, progressMonitor);
}
- generateFiles(zipFile,
+ generateFilesFromZipFile(zipFile,
filePath.append(name),
subDestinationContainer,
false,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-08-22 14:39:28
|
Revision: 935
http://cishell.svn.sourceforge.net/cishell/?rev=935&view=rev
Author: pataphil
Date: 2009-08-22 14:39:16 +0000 (Sat, 22 Aug 2009)
Log Message:
-----------
* Made changes in source code to reflect tutorial. (Now accepts an addition command-line argument--an NWB file--in second-argument position.)
Modified Paths:
--------------
trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/SourceFiles/NonJavaAlgorithmWizardExample.cpp
Modified: trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/SourceFiles/NonJavaAlgorithmWizardExample.cpp
===================================================================
--- trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/SourceFiles/NonJavaAlgorithmWizardExample.cpp 2009-08-20 23:50:23 UTC (rev 934)
+++ trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/SourceFiles/NonJavaAlgorithmWizardExample.cpp 2009-08-22 14:39:16 UTC (rev 935)
@@ -4,30 +4,34 @@
#define PROGRAM_NAME "NonJavaAlgorithmWizardExample"
-#define EXPECTED_ARGUMENT_COUNT 4
+#define EXPECTED_ARGUMENT_COUNT 5
#define USER_FILE_ARGUMENT_INDEX 1
-#define PLATFORM_FILE_ARGUMENT_INDEX 2
-#define OUTPUT_FILE_ARGUMENT_INDEX 3
+#define NWB_FILE_ARGUMENT_INDEX 2
+#define PLATFORM_FILE_ARGUMENT_INDEX 3
+#define OUTPUT_FILE_ARGUMENT_INDEX 4
std::string readUserFile(const std::string& userFileName)
throw(std::exception);
+std::string readNWBFile(const std::string& nwbFileName) throw(std::exception);
std::string readPlatformFile(const std::string& platformFileName)
throw(std::exception);
std::string readFileContents(std::ifstream& inputFileStream);
void outputCombinedContentsToFile(const std::string& userFileContents,
+ const std::string& nwbFileContents,
const std::string& platformFileContents,
const std::string& fileName)
throw(std::exception);
int main (int argumentCount, char* arguments[]) {
if (argumentCount < EXPECTED_ARGUMENT_COUNT) {
- std::cerr << "You must provide " << EXPECTED_ARGUMENT_COUNT;
+ std::cerr << "You must provide " << EXPECTED_ARGUMENT_COUNT - 1;
std::cerr << " arguments to the program." << std::endl;
std::cerr << "Expected format:" << std::endl;
- std::cerr << "user_file platform_file output_file" << std::endl;
+ std::cerr << "user_file nwb_file platform_file output_file";
+ std::cerr << std::endl;
} else {
- // Process the user-specified file.
+ // Process the end-user-specified file.
std::string userFileName = arguments[USER_FILE_ARGUMENT_INDEX];
std::string userFileContents;
@@ -45,6 +49,23 @@
return 1;
}
+ // Process the NWB file.
+
+ std::string nwbFileName = arguments[NWB_FILE_ARGUMENT_INDEX];
+ std::string nwbFileContents;
+
+ try {
+ nwbFileContents = readNWBFile(nwbFileName);
+
+ std::cout << "Successfully read the NWB file you selected off of ";
+ std::cout << "the Data Manager (\'" << nwbFileName << "\').";
+ std::cout << std:: endl;
+ } catch (std::exception& readNWBFileException) {
+ std::cerr << "There was an error reading the NWB file \'";
+ std::cerr << nwbFileName << "\': \"";
+ std::cerr << readNWBFileException.what() << "\"" << std::endl;
+ }
+
// Process the platform file.
std::string platformFileName = arguments[PLATFORM_FILE_ARGUMENT_INDEX];
@@ -71,8 +92,10 @@
std::string outputFileName = arguments[OUTPUT_FILE_ARGUMENT_INDEX];
try {
- outputCombinedContentsToFile(
- userFileContents, platformFileContents, outputFileName);
+ outputCombinedContentsToFile(userFileContents,
+ nwbFileContents,
+ platformFileContents,
+ outputFileName);
std::cout << "Successfully wrote the combined contents to the ";
std::cout << "file \'" << outputFileName << "\'." << std::endl;
@@ -102,6 +125,19 @@
return userFileContents;
}
+std::string readNWBFile(const std::string& nwbFileName) throw(std::exception) {
+ std::ifstream nwbFileStream(nwbFileName.c_str(), std::ifstream::in);
+
+ if (!nwbFileStream.is_open()) {
+ throw std::ios_base::failure("Unable to open NWB file for reading.");
+ }
+
+ std::string nwbFileContents = readFileContents(nwbFileStream);
+ nwbFileStream.close();
+
+ return nwbFileContents;
+}
+
std::string readPlatformFile(const std::string& platformFileName)
throw(std::exception) {
std::ifstream platformFileStream(platformFileName.c_str(),
@@ -129,6 +165,7 @@
}
void outputCombinedContentsToFile(const std::string& userFileContents,
+ const std::string& nwbFileContents,
const std::string& platformFileContents,
const std::string& fileName)
throw(std::exception) {
@@ -139,6 +176,12 @@
"Unable to open output file for writing.");
}
+ outputFileStream << "User file contents:" << std::endl;
outputFileStream << userFileContents << std::endl;
+
+ outputFileStream << "NWB file contents:" << std::endl;
+ outputFileStream << nwbFileContents << std::endl;
+
+ outputFileStream << "Platform:" << std::endl;
outputFileStream << platformFileContents << std::endl;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-08-20 23:50:40
|
Revision: 934
http://cishell.svn.sourceforge.net/cishell/?rev=934&view=rev
Author: pataphil
Date: 2009-08-20 23:50:23 +0000 (Thu, 20 Aug 2009)
Log Message:
-----------
* Fixed some naming and other miscellaneous typo issues.
Modified Paths:
--------------
trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/pagepanels/AddOutputDataPanel.java
trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/NewStaticExecutableAlgorithmTemplate.java
trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/OutputDataItemEditor.java
Modified: trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/pagepanels/AddOutputDataPanel.java
===================================================================
--- trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/pagepanels/AddOutputDataPanel.java 2009-08-20 17:31:49 UTC (rev 933)
+++ trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/pagepanels/AddOutputDataPanel.java 2009-08-20 23:50:23 UTC (rev 934)
@@ -64,7 +64,7 @@
GetOutputDataAction action = new GetOutputDataAction();
display.syncExec(action);
- return action.inputDataItems;
+ return action.outputDataItems;
} else {
return new OutputDataItem[0];
}
@@ -108,16 +108,16 @@
}
private class GetOutputDataAction implements Runnable {
- OutputDataItem[] inputDataItems;
+ OutputDataItem[] outputDataItems;
public void run() {
TableItem[] tableItems = listBuilder.getTable().getItems();
- inputDataItems = new OutputDataItem[tableItems.length];
- Map idToInputDataItemMap = delegate.getIDToOutputDataItemMap();
+ outputDataItems = new OutputDataItem[tableItems.length];
+ Map idToOutputDataItemMap = delegate.getIDToOutputDataItemMap();
for (int ii = 0; ii < tableItems.length; ii++) {
- inputDataItems[ii] = (OutputDataItem)
- idToInputDataItemMap.get(tableItems[ii].getText(0));
+ outputDataItems[ii] = (OutputDataItem)
+ idToOutputDataItemMap.get(tableItems[ii].getText(0));
}
}
}
Modified: trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/NewStaticExecutableAlgorithmTemplate.java
===================================================================
--- trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/NewStaticExecutableAlgorithmTemplate.java 2009-08-20 17:31:49 UTC (rev 933)
+++ trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/NewStaticExecutableAlgorithmTemplate.java 2009-08-20 23:50:23 UTC (rev 934)
@@ -411,7 +411,7 @@
createPage(PROJECT_BUNDLE_PROPERTIES_PAGE_NUMBER);
bundlePropertiesPage.setTitle("Bundle Properties");
bundlePropertiesPage.setDescription(
- "Enter the bundle name, and bundle version");
+ "Enter the Bundle Name, Bundle Symbolic Name, and Bundle Version");
return bundlePropertiesPage;
}
@@ -432,7 +432,7 @@
WizardPage projectPropertiesPage =
createPage(PROJECT_PROPERTIES_PAGE_NUMBER);
projectPropertiesPage.setTitle("Project Properties");
- projectPropertiesPage.setDescription("Enter project properties");
+ projectPropertiesPage.setDescription("Enter Project Properties");
return projectPropertiesPage;
}
@@ -440,8 +440,8 @@
private ParameterListBuilderPage createProjectParametersPage() {
ParameterListBuilderPage projectParametersPage =
new ParameterListBuilderPage(SETUP_PARAMETERS_PAGE_ID);
- projectParametersPage.setTitle("Project Parameters");
- projectParametersPage.setDescription("Enter project parameters");
+ projectParametersPage.setTitle("Algorithm Parameters");
+ projectParametersPage.setDescription("Enter Project Parameters");
return projectParametersPage;
}
@@ -451,7 +451,7 @@
new SpecifyInAndOutDataPage(SPECIFY_IN_AND_OUT_DATA_PAGE_ID);
inputAndOutputDataPage.setTitle("Input and Output Data");
inputAndOutputDataPage.setDescription(
- "Enter the input and output data");
+ "Enter the Input and Output Data");
return inputAndOutputDataPage;
}
@@ -465,7 +465,7 @@
this.templateStringOption);
specifyTemplateStringPage.setTitle("Template String");
specifyTemplateStringPage.setDescription(
- "Enter the template string used to execute your program");
+ "Enter the Template String Used to Execute Your Program");
return specifyTemplateStringPage;
}
@@ -477,7 +477,7 @@
this.sourceCodeFilesOption);
sourceCodeFilesPage.setTitle("Source Code Files (Optional)");
sourceCodeFilesPage.setDescription(
- "Enter the source code files for your program");
+ "Enter the Source Code Files for Your Program");
return sourceCodeFilesPage;
}
Modified: trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/OutputDataItemEditor.java
===================================================================
--- trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/OutputDataItemEditor.java 2009-08-20 17:31:49 UTC (rev 933)
+++ trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/OutputDataItemEditor.java 2009-08-20 23:50:23 UTC (rev 934)
@@ -47,7 +47,7 @@
this.mimeTypeText = createTextInput(panel, "Mime Type");
this.mimeTypeText.setText(this.outputDataItem.getMimeType());
- composite.getShell().setText("Input Data Item Editor");
+ composite.getShell().setText("Output Data Item Editor");
return composite;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tan...@us...> - 2009-08-20 17:32:02
|
Revision: 933
http://cishell.svn.sourceforge.net/cishell/?rev=933&view=rev
Author: tankchintan
Date: 2009-08-20 17:31:49 +0000 (Thu, 20 Aug 2009)
Log Message:
-----------
Made changes to include a legend in Circular Hierarchy Viz. Included a legend for color for nodes based on user selected attribute. Made minor changes to utilities file. Code reviewed by Joseph.
Modified Paths:
--------------
trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayUtilities.java
Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayUtilities.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayUtilities.java 2009-08-20 02:05:12 UTC (rev 932)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/ArrayUtilities.java 2009-08-20 17:31:49 UTC (rev 933)
@@ -3,7 +3,7 @@
public class ArrayUtilities {
public static int indexOf(Object[] array, Object target) {
for (int ii = 0; ii < array.length; ii++) {
- if (target.equals(array[ii])) {
+ if (array[ii].equals(target)) {
return ii;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-08-20 02:05:19
|
Revision: 932
http://cishell.svn.sourceforge.net/cishell/?rev=932&view=rev
Author: pataphil
Date: 2009-08-20 02:05:12 +0000 (Thu, 20 Aug 2009)
Log Message:
-----------
Initial commit of:
example C++ code for Static Executable Wizard tutorial.
Added Paths:
-----------
trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/.cproject
trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/.project
trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/HeaderFiles/
trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/SourceFiles/
trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/SourceFiles/NonJavaAlgorithmWizardExample.cpp
Added: trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/.cproject
===================================================================
--- trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/.cproject (rev 0)
+++ trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/.cproject 2009-08-20 02:05:12 UTC (rev 932)
@@ -0,0 +1,946 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?fileVersion 4.0.0?>
+
+<cproject>
+<storageModule moduleId="org.eclipse.cdt.core.settings">
+<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.debug.1644113239">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.1644113239" moduleId="org.eclipse.cdt.core.settings" name="Debug">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="NonJavaAlgorithmWizardExample" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.exe.debug.1644113239" name="Debug" parent="cdt.managedbuild.config.gnu.mingw.exe.debug">
+<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.1644113239." name="/" resourcePath="">
+<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug.52662792" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">
+<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.807640386" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/>
+<builder buildPath="${workspace_loc:/NonJavaAlgorithmWizardExample/Debug}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.152442126" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
+<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug.2040180653" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug">
+<inputType id="cdt.managedbuild.tool.gnu.assembler.input.590231161" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.1921251537" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug.699687785" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug">
+<option id="gnu.cpp.compiler.mingw.exe.debug.option.optimization.level.791453819" name="Optimization Level" superClass="gnu.cpp.compiler.mingw.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level.1792351603" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.option.include.paths.50944649" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
+<listOptionValue builtIn="false" value=""${workspace_loc:/NonJavaAlgorithmWizardExample/HeaderFiles}""/>
+</option>
+<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1382736232" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.948129648" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug">
+<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.mingw.exe.debug.option.optimization.level.1988620001" name="Optimization Level" superClass="gnu.c.compiler.mingw.exe.debug.option.optimization.level" valueType="enumerated"/>
+<option id="gnu.c.compiler.mingw.exe.debug.option.debugging.level.306514699" name="Debug Level" superClass="gnu.c.compiler.mingw.exe.debug.option.debugging.level" value="gnu.c.debugging.level.max" valueType="enumerated"/>
+<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1615213497" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.debug.1436854548" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.debug"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.debug.109316907" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.debug">
+<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1514373860" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+</inputType>
+</tool>
+</toolChain>
+</folderInfo>
+<sourceEntries>
+<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="HeaderFiles"/>
+<entry excluding="SourceFiles|HeaderFiles" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="SourceFiles"/>
+</sourceEntries>
+</configuration>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.966371147;cdt.managedbuild.config.gnu.mingw.exe.release.966371147.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release.1548973194;cdt.managedbuild.tool.gnu.c.compiler.input.652058097">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.1644113239;cdt.managedbuild.config.gnu.mingw.exe.debug.1644113239.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.948129648;cdt.managedbuild.tool.gnu.c.compiler.input.1615213497">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.966371147;cdt.managedbuild.config.gnu.mingw.exe.release.966371147.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release.1388102963;cdt.managedbuild.tool.gnu.cpp.compiler.input.76839396">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.1644113239;cdt.managedbuild.config.gnu.mingw.exe.debug.1644113239.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug.699687785;cdt.managedbuild.tool.gnu.cpp.compiler.input.1382736232">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+</cconfiguration>
+<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.release.966371147">
+<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.release.966371147" moduleId="org.eclipse.cdt.core.settings" name="Release">
+<externalSettings/>
+<extensions>
+<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
+<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+</extensions>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<configuration artifactName="NonJavaAlgorithmWizardExample" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.exe.release.966371147" name="Release" parent="cdt.managedbuild.config.gnu.mingw.exe.release">
+<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.release.966371147." name="/" resourcePath="">
+<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.release.311133608" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.release">
+<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.release.1919416670" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.release"/>
+<builder buildPath="${workspace_loc:/NonJavaAlgorithmWizardExample/Release}" id="cdt.managedbuild.tool.gnu.builder.mingw.base.791330309" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="cdt.managedbuild.tool.gnu.builder.mingw.base"/>
+<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release.135319682" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.release">
+<inputType id="cdt.managedbuild.tool.gnu.assembler.input.2036241763" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.archiver.mingw.base.322714162" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.mingw.base"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release.1388102963" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release">
+<option id="gnu.cpp.compiler.mingw.exe.release.option.optimization.level.1621121370" name="Optimization Level" superClass="gnu.cpp.compiler.mingw.exe.release.option.optimization.level" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.mingw.exe.release.option.debugging.level.142361707" name="Debug Level" superClass="gnu.cpp.compiler.mingw.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
+<option id="gnu.cpp.compiler.option.include.paths.625366716" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
+<listOptionValue builtIn="false" value=""${workspace_loc:/NonJavaAlgorithmWizardExample/HeaderFiles}""/>
+</option>
+<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.76839396" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release.1548973194" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release">
+<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.mingw.exe.release.option.optimization.level.248613083" name="Optimization Level" superClass="gnu.c.compiler.mingw.exe.release.option.optimization.level" valueType="enumerated"/>
+<option id="gnu.c.compiler.mingw.exe.release.option.debugging.level.658649043" name="Debug Level" superClass="gnu.c.compiler.mingw.exe.release.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
+<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.652058097" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+</tool>
+<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.release.2036818552" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.exe.release"/>
+<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release.1164593450" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release">
+<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.753065985" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+</inputType>
+</tool>
+</toolChain>
+</folderInfo>
+<sourceEntries>
+<entry excluding="SourceFiles|HeaderFiles" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="HeaderFiles"/>
+<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="SourceFiles"/>
+</sourceEntries>
+</configuration>
+</storageModule>
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>
+<storageModule moduleId="scannerConfiguration">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.966371147;cdt.managedbuild.config.gnu.mingw.exe.release.966371147.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.release.1548973194;cdt.managedbuild.tool.gnu.c.compiler.input.652058097">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.1644113239;cdt.managedbuild.config.gnu.mingw.exe.debug.1644113239.;cdt.managedbuild.tool.gnu.c.compiler.mingw.exe.debug.948129648;cdt.managedbuild.tool.gnu.c.compiler.input.1615213497">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.release.966371147;cdt.managedbuild.config.gnu.mingw.exe.release.966371147.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.release.1388102963;cdt.managedbuild.tool.gnu.cpp.compiler.input.76839396">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.mingw.exe.debug.1644113239;cdt.managedbuild.config.gnu.mingw.exe.debug.1644113239.;cdt.managedbuild.tool.gnu.cpp.compiler.mingw.exe.debug.699687785;cdt.managedbuild.tool.gnu.cpp.compiler.input.1382736232">
+<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="makefileGenerator">
+<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
+<buildOutputProvider>
+<openAction enabled="true" filePath=""/>
+<parser enabled="true"/>
+</buildOutputProvider>
+<scannerInfoProvider id="specsFile">
+<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
+<parser enabled="true"/>
+</scannerInfoProvider>
+</profile>
+</scannerConfigBuildInfo>
+</storageModule>
+</cconfiguration>
+</storageModule>
+<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+<project id="NonJavaAlgorithmWizardExample.cdt.managedbuild.target.gnu.mingw.exe.809487028" name="Executable" projectType="cdt.managedbuild.target.gnu.mingw.exe"/>
+</storageModule>
+</cproject>
Added: trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/.project
===================================================================
--- trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/.project (rev 0)
+++ trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/.project 2009-08-20 02:05:12 UTC (rev 932)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.cishell.tutorials.NonJavaAlgorithmWizardExample</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+ <triggers>clean,full,incremental,</triggers>
+ <arguments>
+ <dictionary>
+ <key>?name?</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.append_environment</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildArguments</key>
+ <value></value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildCommand</key>
+ <value>make</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.buildLocation</key>
+ <value>${workspace_loc:/NonJavaAlgorithmWizardExample/Debug}</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.contents</key>
+ <value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+ <value>false</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.enableFullBuild</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.stopOnError</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+ <value>true</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.cdt.core.cnature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+ <nature>org.eclipse.cdt.core.ccnature</nature>
+ <nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+ </natures>
+</projectDescription>
Added: trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/SourceFiles/NonJavaAlgorithmWizardExample.cpp
===================================================================
--- trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/SourceFiles/NonJavaAlgorithmWizardExample.cpp (rev 0)
+++ trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/SourceFiles/NonJavaAlgorithmWizardExample.cpp 2009-08-20 02:05:12 UTC (rev 932)
@@ -0,0 +1,144 @@
+#include <exception>
+#include <iostream>
+#include <fstream>
+
+
+#define PROGRAM_NAME "NonJavaAlgorithmWizardExample"
+#define EXPECTED_ARGUMENT_COUNT 4
+#define USER_FILE_ARGUMENT_INDEX 1
+#define PLATFORM_FILE_ARGUMENT_INDEX 2
+#define OUTPUT_FILE_ARGUMENT_INDEX 3
+
+std::string readUserFile(const std::string& userFileName)
+ throw(std::exception);
+std::string readPlatformFile(const std::string& platformFileName)
+ throw(std::exception);
+std::string readFileContents(std::ifstream& inputFileStream);
+
+void outputCombinedContentsToFile(const std::string& userFileContents,
+ const std::string& platformFileContents,
+ const std::string& fileName)
+ throw(std::exception);
+
+int main (int argumentCount, char* arguments[]) {
+ if (argumentCount < EXPECTED_ARGUMENT_COUNT) {
+ std::cerr << "You must provide " << EXPECTED_ARGUMENT_COUNT;
+ std::cerr << " arguments to the program." << std::endl;
+ std::cerr << "Expected format:" << std::endl;
+ std::cerr << "user_file platform_file output_file" << std::endl;
+ } else {
+ // Process the user-specified file.
+
+ std::string userFileName = arguments[USER_FILE_ARGUMENT_INDEX];
+ std::string userFileContents;
+
+ try {
+ userFileContents = readUserFile(userFileName);
+
+ std::cout << "Successfully read the file you specified \'";
+ std::cout << userFileName << "\'." << std::endl;
+ } catch (std::exception& readUserFileException) {
+ std::cerr << "There was an error reading your file \'";
+ std::cerr << userFileName << "\': \"";
+ std::cerr << readUserFileException.what() << "\"" << std::endl;
+
+ return 1;
+ }
+
+ // Process the platform file.
+
+ std::string platformFileName = arguments[PLATFORM_FILE_ARGUMENT_INDEX];
+ std::string platformFileContents;
+
+ try {
+ platformFileContents = readPlatformFile(platformFileName);
+
+ std::cout << "Successfully read the platform file \'";
+ std::cout << platformFileName << "\'." << std::endl;
+ } catch (std::exception& readPlatformFileException) {
+ std::cerr << "There was an error reading the platform file \'";
+ std::cerr << platformFileName << "\': \"";
+ std::cerr << readPlatformFileException.what() << "\"" << std::endl;
+
+ return 1;
+ }
+
+ /*
+ * Combine the user-specified file contents and the platform file into
+ * the user-specified output file.
+ */
+
+ std::string outputFileName = arguments[OUTPUT_FILE_ARGUMENT_INDEX];
+
+ try {
+ outputCombinedContentsToFile(
+ userFileContents, platformFileContents, outputFileName);
+
+ std::cout << "Successfully wrote the combined contents to the ";
+ std::cout << "file \'" << outputFileName << "\'." << std::endl;
+ } catch (std::exception& outputCombinedContentsToFileException) {
+ std::cerr << "There was an error outputting the combined contents";
+ std::cerr << " of the file you specified and the platform file ";
+ std::cerr << "to the file \'" << outputFileName << "\': \"";
+ std::cerr << outputCombinedContentsToFileException.what();
+ std::cerr << "\"" << std::endl;
+ }
+ }
+
+ return 0;
+}
+
+std::string readUserFile(const std::string& userFileName)
+ throw(std::exception) {
+ std::ifstream userFileStream(userFileName.c_str(), std::ifstream::in);
+
+ if (!userFileStream.is_open()) {
+ throw std::ios_base::failure("Unable to open user file for reading.");
+ }
+
+ std::string userFileContents = readFileContents(userFileStream);
+ userFileStream.close();
+
+ return userFileContents;
+}
+
+std::string readPlatformFile(const std::string& platformFileName)
+ throw(std::exception) {
+ std::ifstream platformFileStream(platformFileName.c_str(),
+ std::ifstream::in);
+
+ if (!platformFileStream.is_open()) {
+ throw std::ios_base::failure(
+ "Unable to open platform file for reading.");
+ }
+
+ std::string platformFileContents = readFileContents(platformFileStream);
+ platformFileStream.close();
+
+ return platformFileContents;
+}
+
+std::string readFileContents(std::ifstream& inputFileStream) {
+ std::string fileContents;
+
+ while (inputFileStream.good()) {
+ fileContents += inputFileStream.get();
+ }
+
+ return fileContents;
+}
+
+void outputCombinedContentsToFile(const std::string& userFileContents,
+ const std::string& platformFileContents,
+ const std::string& fileName)
+ throw(std::exception) {
+ std::ofstream outputFileStream(fileName.c_str(), std::ofstream::out);
+
+ if (!outputFileStream.is_open()) {
+ throw std::ios_base::failure(
+ "Unable to open output file for writing.");
+ }
+
+ outputFileStream << userFileContents << std::endl;
+ outputFileStream << platformFileContents << std::endl;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-08-20 02:04:10
|
Revision: 931
http://cishell.svn.sourceforge.net/cishell/?rev=931&view=rev
Author: pataphil
Date: 2009-08-20 02:04:03 +0000 (Thu, 20 Aug 2009)
Log Message:
-----------
Initial import for:
example C++ code for Static Executable Wizard tutorial.
Added Paths:
-----------
trunk/tutorials/org.cishell.tutorials.NonJavaAlgorithmWizardExample/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-08-20 02:03:22
|
Revision: 930
http://cishell.svn.sourceforge.net/cishell/?rev=930&view=rev
Author: pataphil
Date: 2009-08-20 02:03:15 +0000 (Thu, 20 Aug 2009)
Log Message:
-----------
Code for any CIShell-related tutorials.
Added Paths:
-----------
trunk/tutorials/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <pat...@us...> - 2009-08-18 22:26:33
|
Revision: 929
http://cishell.svn.sourceforge.net/cishell/?rev=929&view=rev
Author: pataphil
Date: 2009-08-18 22:26:25 +0000 (Tue, 18 Aug 2009)
Log Message:
-----------
* Finished enhancing GUI parameter builder page (for both the Java and Static Executable Algorithm Wizards).
* Reviewed by Chintan.
Modified Paths:
--------------
trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/guibuilder/AttributeDefinitionEditor.java
trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/guibuilder/EditableAttributeDefinition.java
trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/guibuilder/ParameterBuilderDelegate.java
trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/pages/ParameterListBuilderPage.java
trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/StaticExecutableInputDataDelegate.java
trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/StaticExecutableOutputDataDelegate.java
Added Paths:
-----------
trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/utilities/ParameterUtilities.java
Modified: trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/guibuilder/AttributeDefinitionEditor.java
===================================================================
--- trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/guibuilder/AttributeDefinitionEditor.java 2009-08-18 21:53:40 UTC (rev 928)
+++ trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/guibuilder/AttributeDefinitionEditor.java 2009-08-18 22:26:25 UTC (rev 929)
@@ -1,5 +1,6 @@
package org.cishell.templates.guibuilder;
+import org.cishell.templates.wizards.utilities.ParameterUtilities;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
@@ -12,90 +13,165 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
+import org.osgi.service.metatype.AttributeDefinition;
public class AttributeDefinitionEditor extends Dialog {
- public static final String[] TYPE_LABELS = new String[]{
- "String","Integer","Long","Short","Double","Float","Boolean", "Char",
- "Byte", "File", "Directory"
- };
- public static final int[] TYPE_VALUES = new int[] {
- 1,3,2,4,7,8,11,5,6,1,1
- };
+ private EditableAttributeDefinition attributeDefinition;
+ private Text idText;
+ private Text nameText;
+ private Text descriptionText;
+ private Text defaultValueText;
+ private Text minimumValueText;
+ private Text maximumValueText;
+ private Combo selectedTypeCombo;
- private EditableAttributeDefinition attribute;
- private Text id;
- private Text name;
- private Text description;
- private Text defaultValue;
- private Combo type;
-
- public AttributeDefinitionEditor(Composite parent, EditableAttributeDefinition attr) {
- this(parent.getShell(), attr);
+ public AttributeDefinitionEditor(
+ Composite parent,
+ EditableAttributeDefinition attributeDefinition) {
+ this(parent.getShell(), attributeDefinition);
}
- private AttributeDefinitionEditor(Shell parentShell, EditableAttributeDefinition attr) {
+ private AttributeDefinitionEditor(
+ Shell parentShell,
+ EditableAttributeDefinition attributeDefinition) {
super(parentShell);
- this.attribute = attr;
+ this.attributeDefinition = attributeDefinition;
}
protected Control createDialogArea(Composite parent) {
- Composite composite = (Composite) super.createDialogArea(parent);
+ Composite composite = (Composite)super.createDialogArea(parent);
Composite panel = new Composite(composite, SWT.NONE);
GridLayout gridLayout = new GridLayout(2, false);
panel.setLayout(gridLayout);
- id = newTextInput(panel, "Unique ID");
- id.setText(attribute.getID());
+ this.idText = createNewTextInput(panel, ParameterUtilities.ID_LABEL);
+ this.idText.setText(attributeDefinition.getID());
- name = newTextInput(panel, "Name");
- name.setText(attribute.getName());
+ this.nameText = createNewTextInput(panel, ParameterUtilities.NAME_LABEL);
+ this.nameText.setText(attributeDefinition.getName());
- description = newTextInput(panel, "Description");
- description.setText(attribute.getDescription());
+ this.selectedTypeCombo =
+ newListInput(panel, ParameterUtilities.INPUT_TYPE_LABEL);
+ this.selectedTypeCombo.setItems(ParameterUtilities.TYPE_LABELS);
- defaultValue = newTextInput(panel, "Default Value");
- defaultValue.setText(attribute.getDefaultValue()[0]);
+ this.descriptionText =
+ createNewTextInput(panel, ParameterUtilities.DESCRIPTION_LABEL);
+ this.descriptionText.setText(attributeDefinition.getDescription());
- type = newListInput(panel, "Input Type");
- type.setItems(TYPE_LABELS);
+ this.defaultValueText =
+ createNewTextInput(panel, ParameterUtilities.DEFAULT_VALUE_LABEL);
+ this.defaultValueText.setText(
+ attributeDefinition.getActualDefaultValue());
- type.addSelectionListener(new SelectionListener(){
- public void widgetDefaultSelected(SelectionEvent e) {
- widgetSelected(e);
+ this.minimumValueText =
+ createNewTextInput(panel, ParameterUtilities.MINIMUM_VALUE_LABEL);
+ this.minimumValueText.setText(attributeDefinition.getMinValue());
+
+ this.maximumValueText =
+ createNewTextInput(panel, ParameterUtilities.MAXIMUM_VALUE_LABEL);
+ this.maximumValueText.setText(attributeDefinition.getMaxValue());
+
+ this.selectedTypeCombo.addSelectionListener(new SelectionListener() {
+ public void widgetDefaultSelected(SelectionEvent selectionEvent) {
+ widgetSelected(selectionEvent);
}
- public void widgetSelected(SelectionEvent e) {
- int i = type.getSelectionIndex();
- if (i == 9) { //file
- defaultValue.setText("file:");
+ public void widgetSelected(SelectionEvent selectionEvent) {
+ int selectionIndex = selectedTypeCombo.getSelectionIndex();
+
+ boolean hadFileOrDirectoryType =
+ ParameterUtilities.attributeHasFileOrDirectoryType(
+ AttributeDefinitionEditor.this.attributeDefinition);
+
+ if (selectionIndex ==
+ ParameterUtilities.TYPE_VALUE_INDEX_FILE) {
+ AttributeDefinitionEditor.this.defaultValueText.setText(
+ ParameterUtilities.DEFAULT_FILE_VALUE);
+ } else if (selectionIndex ==
+ ParameterUtilities.TYPE_VALUE_INDEX_DIRECTORY) {
+ AttributeDefinitionEditor.this.defaultValueText.setText(
+ ParameterUtilities.DEFAULT_DIRECTORY_VALUE);
+ } else if (hadFileOrDirectoryType) {
+ AttributeDefinitionEditor.this.defaultValueText.setText(
+ "");
}
- if (i == 10) { //directory
- defaultValue.setText("directory:");
- }
- defaultValue.setEnabled(i != 9 && i != 10);
- }});
+
+ /*
+ * Enable the default value if the selectedTypeCombo of value
+ * is not file or directory.
+ */
+ boolean defaultValueTextEnabledStatus =
+ shouldEnableDefaultValueTextBasedOnSelectionIndex(
+ selectionIndex);
+ AttributeDefinitionEditor.this.defaultValueText.setEnabled(
+ defaultValueTextEnabledStatus);
+
+ /*
+ * Enable the minimum and maximum values if the
+ * selectedTypeCombo of value is numeric.
+ */
+ boolean minAndMaxTextsEnabledStatus =
+ shouldEnableMinAndMaxTextsBasedOnSelectionIndex(
+ selectionIndex);
+ AttributeDefinitionEditor.this.minimumValueText.setEnabled(
+ minAndMaxTextsEnabledStatus);
+ AttributeDefinitionEditor.this.maximumValueText.setEnabled(
+ minAndMaxTextsEnabledStatus);
+ }
+ });
- for (int i=0; i < TYPE_VALUES.length; i++) {
- if (TYPE_VALUES[i] == attribute.getType()) {
- type.select(i);
- break;
- }
+ if (ParameterUtilities.attributeHasFileType(
+ this.attributeDefinition)) {
+ this.selectedTypeCombo.select(
+ ParameterUtilities.TYPE_VALUE_INDEX_FILE);
+ } else if (ParameterUtilities.attributeHasDirectoryType(
+ this.attributeDefinition)) {
+ this.selectedTypeCombo.select(
+ ParameterUtilities.TYPE_VALUE_INDEX_DIRECTORY);
+ } else {
+ for (int ii = 0;
+ ii < ParameterUtilities.TYPE_VALUES.length;
+ ii++) {
+ if (ParameterUtilities.TYPE_VALUES[ii] ==
+ this.attributeDefinition.getType()) {
+ this.selectedTypeCombo.select(ii);
+
+ break;
+ }
+ }
}
+ /*
+ * This is necessary because the
+ * this.selectedTypeCombo.select(ii);
+ * line above doesn't actually fire the selected event.
+ */
+ boolean defaultValueTextEnabledStatus =
+ shouldEnableDefaultValueTextBasedOnAttribute(
+ this.attributeDefinition);
+ this.defaultValueText.setEnabled(defaultValueTextEnabledStatus);
+ boolean minAndMaxTextsEnabledStatus =
+ shouldEnableMinAndMaxTextsBasedOnAttribute(
+ this.attributeDefinition);
+ AttributeDefinitionEditor.this.minimumValueText.setEnabled(
+ minAndMaxTextsEnabledStatus);
+ AttributeDefinitionEditor.this.maximumValueText.setEnabled(
+ minAndMaxTextsEnabledStatus);
+
composite.getShell().setText("Parameter Editor");
return composite;
}
- private Text newTextInput(Composite panel, String text) {
+ private Text createNewTextInput(Composite panel, String text) {
Label label = new Label(panel, SWT.NONE);
label.setText(text);
GridData data = new GridData(SWT.LEFT, SWT.BEGINNING, false, false);
label.setLayoutData(data);
- Text input = new Text(panel, SWT.NONE);
+ Text input = new Text(panel, SWT.BORDER);
data = new GridData(SWT.FILL, SWT.BEGINNING, true, false);
input.setLayoutData(data);
@@ -113,24 +189,88 @@
return list;
}
+ /*
+ * TODO: Validate the default, min, and max fields depending on the type.
+ * This may require setting up a non-editable string field for errors and
+ * throwing an exception back to here from the validation methods,
+ * or something.
+ */
protected void okPressed() {
- attribute.setID(cleanText(id.getText()));
- attribute.setName(cleanText(name.getText()));
- String desc = cleanText(description.getText());
- if (desc.length() == 0) {
- desc = " ";
- }
- attribute.setDescription(desc);
- attribute.setDefaultValue(new String[]{cleanText(defaultValue.getText())});
- attribute.setType(TYPE_VALUES[type.getSelectionIndex()]);
+ this.attributeDefinition.setID(cleanText(this.idText.getText()));
+ this.attributeDefinition.setName(cleanText(this.nameText.getText()));
+ this.attributeDefinition.setType(
+ ParameterUtilities.TYPE_VALUES[
+ this.selectedTypeCombo.getSelectionIndex()]);
+ this.attributeDefinition.setDescription(
+ cleanText(this.descriptionText.getText(), false));
+ // TODO: cleanDefaultValue
+ this.attributeDefinition.setDefaultValue(
+ cleanText(this.defaultValueText.getText()));
+ // TODO: cleanNumberValue
+ this.attributeDefinition.setMinValue(
+ cleanText(this.minimumValueText.getText()));
+ this.attributeDefinition.setMaxValue(
+ cleanText(this.maximumValueText.getText()));
super.okPressed();
}
private String cleanText(String text) {
- text = text.replaceAll("<", "<");
- text = text.replaceAll(">", ">");
-
- return text;
+ return cleanText(text, true);
}
+
+ private String cleanText(String text, boolean canHaveZeroLength) {
+ String cleanedText =
+ text.replaceAll("<", "<").replaceAll(">", ">");
+
+ if (!canHaveZeroLength && cleanedText.length() == 0) {
+ return " ";
+ } else {
+ return cleanedText;
+ }
+ }
+
+ private static boolean shouldEnableDefaultValueTextBasedOnSelectionIndex(
+ int selectionIndex) {
+ switch (selectionIndex) {
+ default:
+ return true;
+ case ParameterUtilities.TYPE_VALUE_INDEX_FILE:
+ case ParameterUtilities.TYPE_VALUE_INDEX_DIRECTORY:
+ return false;
+ }
+ }
+
+ private static boolean shouldEnableDefaultValueTextBasedOnAttribute(
+ EditableAttributeDefinition attribute) {
+ return !ParameterUtilities.attributeHasFileOrDirectoryType(attribute);
+ }
+
+ private static boolean shouldEnableMinAndMaxTextsBasedOnSelectionIndex(
+ int selectionIndex) {
+ switch (selectionIndex) {
+ default:
+ return true;
+ case ParameterUtilities.TYPE_VALUE_INDEX_STRING:
+ case ParameterUtilities.TYPE_VALUE_INDEX_BOOLEAN:
+ case ParameterUtilities.TYPE_VALUE_INDEX_CHARACTER:
+ case ParameterUtilities.TYPE_VALUE_INDEX_BYTE:
+ case ParameterUtilities.TYPE_VALUE_INDEX_FILE:
+ case ParameterUtilities.TYPE_VALUE_INDEX_DIRECTORY:
+ return false;
+ }
+ }
+
+ private static boolean shouldEnableMinAndMaxTextsBasedOnAttribute(
+ EditableAttributeDefinition attribute) {
+ switch (attribute.getType()) {
+ default:
+ return true;
+ case AttributeDefinition.STRING:
+ case AttributeDefinition.BOOLEAN:
+ case AttributeDefinition.CHARACTER:
+ case AttributeDefinition.BYTE:
+ return false;
+ }
+ }
}
Modified: trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/guibuilder/EditableAttributeDefinition.java
===================================================================
--- trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/guibuilder/EditableAttributeDefinition.java 2009-08-18 21:53:40 UTC (rev 928)
+++ trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/guibuilder/EditableAttributeDefinition.java 2009-08-18 22:26:25 UTC (rev 929)
@@ -19,15 +19,18 @@
String id;
String name;
String description;
- String[] defaultValue;
+ String defaultValue;
int type;
String minValue;
String maxValue;
public EditableAttributeDefinition() {}
- public EditableAttributeDefinition(String id, String name, String description,
- String[] defaultValue, int type) {
+ public EditableAttributeDefinition(String id,
+ String name,
+ String description,
+ String defaultValue,
+ int type) {
this.id = id;
this.name = name;
this.description = description;
@@ -52,8 +55,12 @@
}
public String[] getDefaultValue() {
- return defaultValue;
+ return new String[] { defaultValue };
}
+
+ public String getActualDefaultValue() {
+ return defaultValue;
+ }
public String getDescription() {
return description;
@@ -72,8 +79,12 @@
}
public void setDefaultValue(String[] defaultValue) {
- this.defaultValue = defaultValue;
+ this.defaultValue = defaultValue[0];
}
+
+ public void setDefaultValue(String defaultValue) {
+ this.defaultValue = defaultValue;
+ }
public void setDescription(String description) {
this.description = description;
Modified: trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/guibuilder/ParameterBuilderDelegate.java
===================================================================
--- trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/guibuilder/ParameterBuilderDelegate.java 2009-08-18 21:53:40 UTC (rev 928)
+++ trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/guibuilder/ParameterBuilderDelegate.java 2009-08-18 22:26:25 UTC (rev 929)
@@ -3,6 +3,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.cishell.templates.wizards.utilities.ParameterUtilities;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.TableItem;
@@ -10,37 +11,68 @@
public class ParameterBuilderDelegate implements BuilderDelegate {
public static final String[] COLUMN_LABELS = new String[] {
- "id", "Type", "Label"
+ "ID",
+ "Label",
+ "Type",
+ "Description",
+ "Default",
+ "Minimum Value (Number Types Only)",
+ "Maximum Value (Number Types Only)"
};
+ public static final String DEFAULT_ATTRIBUTE_DEFINITION_NAME =
+ "Parameter Label";
+ public static final String DEFAULT_ATTRIBUTE_DEFINITION_DESCRIPTION =
+ "Parameter Description";
+ public static final String DEFAULT_ATTRIBUTE_DEFINITION_VALUE =
+ "Default Value";
+ public static final int DEFAULT_ATTRIBUTE_DEFINITION_TYPE =
+ AttributeDefinition.STRING;
+ public static final String DEFAULT_ATTRIBUTE_DEFINITION_MINIMUM_VALUE = "";
+ public static final String DEFAULT_ATTRIBUTE_DEFINITION_MAXIMUM_VALUE = "";
+
private Map idToAttributeMap;
private int lastID;
private Composite parent;
public ParameterBuilderDelegate(Composite parent) {
this.parent = parent;
- idToAttributeMap = new HashMap();
- lastID = 0;
+ this.idToAttributeMap = new HashMap();
+ this.lastID = 0;
}
public String[] createItem() {
- EditableAttributeDefinition attribute = new EditableAttributeDefinition();
- lastID++;
- attribute.setID("" + lastID);
- attribute.setName("Parameter Label");
- attribute.setDescription("Parameter Description");
- attribute.setDefaultValue(new String[] { "Default value" });
- attribute.setType(AttributeDefinition.STRING);
+ EditableAttributeDefinition attributeDefinition =
+ new EditableAttributeDefinition();
+ this.lastID++;
- boolean success = edit(attribute);
+ attributeDefinition.setID(Integer.toString(lastID));
+ attributeDefinition.setName(DEFAULT_ATTRIBUTE_DEFINITION_NAME);
+ attributeDefinition.setType(DEFAULT_ATTRIBUTE_DEFINITION_TYPE);
+ attributeDefinition.setDescription(
+ DEFAULT_ATTRIBUTE_DEFINITION_DESCRIPTION);
+ attributeDefinition.setDefaultValue(
+ DEFAULT_ATTRIBUTE_DEFINITION_VALUE);
+ attributeDefinition.setMinValue(
+ DEFAULT_ATTRIBUTE_DEFINITION_MINIMUM_VALUE);
+ attributeDefinition.setMaxValue(
+ DEFAULT_ATTRIBUTE_DEFINITION_MAXIMUM_VALUE);
- if (success) {
- idToAttributeMap.put(attribute.getID(), attribute);
+ boolean newItemWasCreated =
+ editAttributeDefinition(attributeDefinition);
+
+ if (newItemWasCreated) {
+ idToAttributeMap.put(attributeDefinition.getID(),
+ attributeDefinition);
String[] item = new String[]{
- attribute.getID(),
- getTypeString(attribute.getType()),
- attribute.getName()
+ attributeDefinition.getID(),
+ attributeDefinition.getName(),
+ getTypeString(attributeDefinition),
+ attributeDefinition.getDescription(),
+ attributeDefinition.getActualDefaultValue(),
+ attributeDefinition.getMinValue(),
+ attributeDefinition.getMaxValue()
};
return item;
@@ -55,14 +87,19 @@
EditableAttributeDefinition attribute =
(EditableAttributeDefinition)idToAttributeMap.get(itemID);
- edit(attribute);
-
- item.setText(0, attribute.getID());
- item.setText(1, getTypeString(attribute.getType()));
- item.setText(2, attribute.getName());
+ if (editAttributeDefinition(attribute)) {
+ item.setText(0, attribute.getID());
+ item.setText(1, attribute.getName());
+ item.setText(2, getTypeString(attribute));
+ item.setText(3, attribute.getDescription());
+ item.setText(4, attribute.getActualDefaultValue());
+ item.setText(5, attribute.getMinValue());
+ item.setText(6, attribute.getMaxValue());
+ }
}
- protected boolean edit(EditableAttributeDefinition attribute) {
+ protected boolean editAttributeDefinition(
+ EditableAttributeDefinition attribute) {
AttributeDefinitionEditor attributeDefinitionEditor =
new AttributeDefinitionEditor(parent, attribute);
int returnCode = attributeDefinitionEditor.open();
@@ -74,19 +111,23 @@
return returnCode == Dialog.OK;
}
- protected String getTypeString(int type) {
- String typeString = "Unknown";
+ protected String getTypeString(EditableAttributeDefinition attribute) {
+ if (ParameterUtilities.attributeHasFileType(attribute)) {
+ return "File";
+ } else if (ParameterUtilities.attributeHasDirectoryType(
+ attribute)) {
+ return "Directory";
+ } else {
+ int type = attribute.getType();
+
+ for (int ii = 0; ii < ParameterUtilities.TYPE_VALUES.length; ii++) {
+ if (ParameterUtilities.TYPE_VALUES[ii] == type) {
+ return ParameterUtilities.TYPE_LABELS[ii];
+ }
+ }
+ }
- for (int ii = 0;
- ii < AttributeDefinitionEditor.TYPE_VALUES.length;
- ii++) {
- if (AttributeDefinitionEditor.TYPE_VALUES[ii] == type) {
- typeString = AttributeDefinitionEditor.TYPE_LABELS[ii];
- break;
- }
- }
-
- return typeString;
+ return "Unknown Type";
}
public EditableAttributeDefinition getAttributeDefinition(String id) {
Modified: trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/pages/ParameterListBuilderPage.java
===================================================================
--- trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/pages/ParameterListBuilderPage.java 2009-08-18 21:53:40 UTC (rev 928)
+++ trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/pages/ParameterListBuilderPage.java 2009-08-18 22:26:25 UTC (rev 929)
@@ -13,10 +13,10 @@
* ***************************************************************************/
package org.cishell.templates.wizards.pages;
-import org.cishell.templates.guibuilder.AttributeDefinitionEditor;
import org.cishell.templates.guibuilder.EditableAttributeDefinition;
import org.cishell.templates.guibuilder.ParameterListBuilder;
import org.cishell.templates.staticexecutable.providers.InputParameterProvider;
+import org.cishell.templates.wizards.utilities.ParameterUtilities;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
@@ -58,13 +58,34 @@
EditableAttributeDefinition[] attributes = getAttributeDefinitions();
String output = "";
- for (int ii =0; ii < attributes.length; ii++) {
+ for (int ii = 0; ii < attributes.length; ii++) {
output +=
"\t\t<AD name=\"" + attributes[ii].getName()+"\" " +
"id=\"" + attributes[ii].getID() + "\" " +
"type=\"" + getTypeString(attributes[ii]) + "\" " +
"description=\"" + attributes[ii].getDescription() + "\" " +
- "default=\"" + attributes[ii].getDefaultValue()[0] + "\"/>\n";
+ "default=\"" + attributes[ii].getActualDefaultValue() + "\"";
+
+ switch (attributes[ii].getType()) {
+ /*TODO: make explicit comment
+ * There are more number types than non-number types, so make
+ * switching on number types the default.
+ */
+ case AttributeDefinition.BOOLEAN:
+ case AttributeDefinition.CHARACTER:
+ case AttributeDefinition.STRING:
+ break;
+ default:
+ if (!attributes[ii].getMinValue().equals("")) {
+ output += " min=\"" + attributes[ii].getMinValue() + "\"";
+ }
+
+ if (!attributes[ii].getMaxValue().equals("")) {
+ output += " max=\"" + attributes[ii].getMaxValue() + "\"";
+ }
+ }
+
+ output += "/>\n";
}
return output;
@@ -74,11 +95,9 @@
String typeString = "Unknown";
int type = attribute.getType();
- for (int ii = 0;
- ii < AttributeDefinitionEditor.TYPE_VALUES.length;
- ii++) {
- if (AttributeDefinitionEditor.TYPE_VALUES[ii] == type) {
- typeString = AttributeDefinitionEditor.TYPE_LABELS[ii];
+ for (int ii = 0; ii < ParameterUtilities.TYPE_VALUES.length; ii++) {
+ if (ParameterUtilities.TYPE_VALUES[ii] == type) {
+ typeString = ParameterUtilities.TYPE_LABELS[ii];
break;
}
Modified: trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/StaticExecutableInputDataDelegate.java
===================================================================
--- trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/StaticExecutableInputDataDelegate.java 2009-08-18 21:53:40 UTC (rev 928)
+++ trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/StaticExecutableInputDataDelegate.java 2009-08-18 22:26:25 UTC (rev 929)
@@ -3,8 +3,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.cishell.templates.guibuilder.AttributeDefinitionEditor;
import org.cishell.templates.guibuilder.BuilderDelegate;
+import org.cishell.templates.wizards.utilities.ParameterUtilities;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.TableItem;
@@ -87,11 +87,9 @@
protected String getTypeString(int type) {
String typeString = "Unknown";
- for (int ii = 0;
- ii < AttributeDefinitionEditor.TYPE_VALUES.length;
- ii++) {
- if (AttributeDefinitionEditor.TYPE_VALUES[ii] == type) {
- typeString = AttributeDefinitionEditor.TYPE_LABELS[ii];
+ for (int ii = 0; ii < ParameterUtilities.TYPE_VALUES.length; ii++) {
+ if (ParameterUtilities.TYPE_VALUES[ii] == type) {
+ typeString = ParameterUtilities.TYPE_LABELS[ii];
break;
}
}
Modified: trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/StaticExecutableOutputDataDelegate.java
===================================================================
--- trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/StaticExecutableOutputDataDelegate.java 2009-08-18 21:53:40 UTC (rev 928)
+++ trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/staticexecutable/StaticExecutableOutputDataDelegate.java 2009-08-18 22:26:25 UTC (rev 929)
@@ -3,8 +3,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.cishell.templates.guibuilder.AttributeDefinitionEditor;
import org.cishell.templates.guibuilder.BuilderDelegate;
+import org.cishell.templates.wizards.utilities.ParameterUtilities;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.TableItem;
@@ -103,11 +103,9 @@
protected String getTypeString(int type) {
String typeString = "Unknown";
- for (int ii = 0;
- ii < AttributeDefinitionEditor.TYPE_VALUES.length;
- ii++) {
- if (AttributeDefinitionEditor.TYPE_VALUES[ii] == type) {
- typeString = AttributeDefinitionEditor.TYPE_LABELS[ii];
+ for (int ii = 0; ii < ParameterUtilities.TYPE_VALUES.length; ii++) {
+ if (ParameterUtilities.TYPE_VALUES[ii] == type) {
+ typeString = ParameterUtilities.TYPE_LABELS[ii];
break;
}
}
Added: trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/utilities/ParameterUtilities.java
===================================================================
--- trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/utilities/ParameterUtilities.java (rev 0)
+++ trunk/templates/org.cishell.templates.wizards/src/org/cishell/templates/wizards/utilities/ParameterUtilities.java 2009-08-18 22:26:25 UTC (rev 929)
@@ -0,0 +1,87 @@
+package org.cishell.templates.wizards.utilities;
+
+import org.cishell.templates.guibuilder.EditableAttributeDefinition;
+import org.osgi.service.metatype.AttributeDefinition;
+
+public class ParameterUtilities {
+ public static final String ID_LABEL = "Unique ID";
+ public static final String NAME_LABEL = "Name";
+ public static final String INPUT_TYPE_LABEL = "Input Type";
+ public static final String DESCRIPTION_LABEL = "Description";
+ public static final String DEFAULT_VALUE_LABEL = "Default Value";
+ public static final String MINIMUM_VALUE_LABEL = "Minimum Value";
+ public static final String MAXIMUM_VALUE_LABEL = "Maximum Value";
+
+ public static final String DEFAULT_FILE_VALUE = "file:";
+ public static final String DEFAULT_DIRECTORY_VALUE = "directory:";
+
+ public static final String[] TYPE_LABELS = new String[] {
+ "String",
+ "Integer",
+ "Long",
+ "Short",
+ "Double",
+ "Float",
+ "Boolean",
+ "Char",
+ "Byte",
+ "File",
+ "Directory"
+ };
+
+ public static final int[] TYPE_VALUES = new int[] {
+ AttributeDefinition.STRING,
+ AttributeDefinition.INTEGER,
+ AttributeDefinition.LONG,
+ AttributeDefinition.SHORT,
+ AttributeDefinition.DOUBLE,
+ AttributeDefinition.FLOAT,
+ AttributeDefinition.BOOLEAN,
+ AttributeDefinition.CHARACTER,
+ AttributeDefinition.BYTE,
+ AttributeDefinition.STRING,
+ AttributeDefinition.STRING
+ };
+
+ public static final int TYPE_VALUE_INDEX_STRING = 0;
+ public static final int TYPE_VALUE_INDEX_INTEGER = 1;
+ public static final int TYPE_VALUE_INDEX_LONG = 2;
+ public static final int TYPE_VALUE_INDEX_SHORT = 3;
+ public static final int TYPE_VALUE_INDEX_DOUBLE = 4;
+ public static final int TYPE_VALUE_INDEX_FLOAT = 5;
+ public static final int TYPE_VALUE_INDEX_BOOLEAN = 6;
+ public static final int TYPE_VALUE_INDEX_CHARACTER = 7;
+ public static final int TYPE_VALUE_INDEX_BYTE = 8;
+ public static final int TYPE_VALUE_INDEX_FILE = 9;
+ public static final int TYPE_VALUE_INDEX_DIRECTORY = 10;
+
+ public static boolean attributeHasFileOrDirectoryType(
+ EditableAttributeDefinition attribute) {
+ return attributeHasFileType(attribute) ||
+ attributeHasDirectoryType(attribute);
+ }
+
+ public static boolean attributeHasFileType(
+ EditableAttributeDefinition attribute) {
+ String defaultValue = attribute.getActualDefaultValue();
+
+ if ((attribute.getType() == AttributeDefinition.STRING) &&
+ defaultValue.equals(DEFAULT_FILE_VALUE)) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public static boolean attributeHasDirectoryType(
+ EditableAttributeDefinition attribute) {
+ String defaultValue = attribute.getActualDefaultValue();
+
+ if ((attribute.getType() == AttributeDefinition.STRING) &&
+ defaultValue.equals(DEFAULT_DIRECTORY_VALUE)) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jrb...@us...> - 2009-08-18 22:22:51
|
Revision: 928
http://cishell.svn.sourceforge.net/cishell/?rev=928&view=rev
Author: jrbibers
Date: 2009-08-18 21:53:40 +0000 (Tue, 18 Aug 2009)
Log Message:
-----------
Swap methods should not have been side-effecting
Modified Paths:
--------------
trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/DropdownMutator.java
Modified: trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/DropdownMutator.java
===================================================================
--- trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/DropdownMutator.java 2009-08-18 20:33:00 UTC (rev 927)
+++ trunk/core/org.cishell.utilities/src/org/cishell/utilities/mutateParameter/DropdownMutator.java 2009-08-18 21:53:40 UTC (rev 928)
@@ -86,26 +86,43 @@
});
}
- private static List swapToFront(List list, String item) {
- if (list.contains(item)) {
- int index = list.indexOf(item);
- String displacedItem = (String) list.get(0);
- list.set(0, item);
- list.set(index, displacedItem);
+ private static List swapToFront(List list, String target) {
+
+
+ if (list.contains(target)) {
+ int targetIndex = list.indexOf(target);
+
+ List swappedList = new ArrayList(list.size());
+
+ for (int ii = 0; ii < list.size(); ii++) {
+ swappedList.set(ii, list.get(ii));
+ }
+
+ swappedList.set(0, (String) list.get(targetIndex));
+ swappedList.set(targetIndex, (String) list.get(0));
+
+ return swappedList;
+ } else {
+ return list;
}
-
- return list;
}
- private static String[] swapToFront(String[] array, String item) {
- int index = ArrayUtilities.indexOf(array, item);
+ private static String[] swapToFront(String[] array, String target) {
+ int targetIndex = ArrayUtilities.indexOf(array, target);
- if (index != -1) {
- String displacedItem = array[0];
- array[0] = item;
- array[index] = displacedItem;
+ if (targetIndex != -1) {
+ String[] swappedArray = new String[array.length];
+
+ for (int ii = 0; ii < array.length; ii++) {
+ swappedArray[ii] = array[ii];
+ }
+
+ swappedArray[0] = array[targetIndex];
+ swappedArray[targetIndex] = array[0];
+
+ return swappedArray;
+ } else {
+ return array;
}
-
- return array;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
