Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Eclipse4.x updates #73

Merged
merged 3 commits into from
Aug 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added CIMCheck/.cache
Binary file not shown.
1 change: 1 addition & 0 deletions CIMToolHelp/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Automatic-Module-Name: au.com.langdale.cimtoole.help
Bundle-Name: CIMTool Help Plug-in
Bundle-SymbolicName: au.com.langdale.cimtoole.help;singleton:=true
Bundle-Version: 1.11.1
Expand Down
2 changes: 1 addition & 1 deletion CIMToolPlugin/.classpath
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="lib/commons-io-2.5.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="builders" sourcepath="builders"/>
<classpathentry exported="true" kind="lib" path="lib/joda-time-2.10.6.jar" sourcepath="lib/joda-time-2.10.6-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/gson-2.8.6.jar" sourcepath="lib/gson-2.8.6-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
9 changes: 6 additions & 3 deletions CIMToolPlugin/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=20
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.compliance=20
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand All @@ -16,6 +17,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
Expand Down Expand Up @@ -45,6 +47,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
Expand All @@ -71,4 +74,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=20
3 changes: 2 additions & 1 deletion CIMToolPlugin/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Automatic-Module-Name: au.com.langdale.cimtoole
Bundle-Name: CIMTool Plug-in
Bundle-SymbolicName: au.com.langdale.cimtoole;singleton:=true
Bundle-Version: 1.11.1
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-20
Bundle-ClassPath: cimtoole.jar,
lib/commons-logging-1.1.1.jar,
builders/,
Expand Down
1 change: 1 addition & 0 deletions CIMToolProduct/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ Bundle-SymbolicName: au.com.langdale.cimtool.product;singleton:=true
Bundle-Version: 1.11.1
Bundle-ClassPath: CIMToolProduct
Bundle-Vendor: Langdale Consultants
Automatic-Module-Name: au.com.langdale.cimtool.product
4 changes: 4 additions & 0 deletions CIMToolProduct/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@
name="startupForegroundColor"
value="000000">
</property>
<property
name="preferenceCustomization"
value="plugin_customization.ini">
</property>
</product>
</extension>

Expand Down
2 changes: 1 addition & 1 deletion CIMToolTest/.classpath
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="lib" path="builders"/>
<classpathentry kind="lib" path="CIMToolTestFiles"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
6 changes: 3 additions & 3 deletions CIMToolTest/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.targetPlatform=20
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.compliance=20
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand Down Expand Up @@ -66,4 +66,4 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=20
3 changes: 2 additions & 1 deletion CIMToolTest/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ Require-Bundle: au.com.langdale.cimtoole,
org.eclipse.core.runtime,
org.eclipse.ui,
org.junit
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-20
Automatic-Module-Name: CIMToolTest
2 changes: 1 addition & 1 deletion CIMUtil/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<classpathentry exported="true" kind="lib" path="lib/jackcess-1.2.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/poi-3.0.1-FINAL-20070705.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
9 changes: 6 additions & 3 deletions CIMUtil/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=20
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.compliance=20
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand All @@ -16,6 +17,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
Expand Down Expand Up @@ -46,6 +48,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
Expand All @@ -72,4 +75,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=20
3 changes: 2 additions & 1 deletion CIMUtil/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: CIMUtil
Bundle-SymbolicName: au.com.langdale.cimutil
Bundle-Version: 1.11.1
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-20
Require-Bundle: au.com.langdale.kena
Bundle-ClassPath: cimutil.jar,
lib/poi-3.0.1-FINAL-20070705.jar,
Expand Down Expand Up @@ -54,3 +54,4 @@ Export-Package: au.com.langdale.cim,
org.apache.poi.poifs.storage,
org.apache.poi.util
Bundle-Vendor: Langdale Consultants
Automatic-Module-Name: au.com.langdale.cimutil
7 changes: 5 additions & 2 deletions Kena/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,13 @@
<classpathentry exported="true" kind="lib" path="lib/lucene-core-2.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.5.8.jar"/>
<classpathentry exported="true" kind="lib" path="lib/stax-api-1.0.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/wstx-asl-3.2.9.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.7.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
9 changes: 6 additions & 3 deletions Kena/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=20
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.compliance=20
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand All @@ -16,6 +17,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
Expand Down Expand Up @@ -45,6 +47,7 @@ org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
Expand All @@ -71,4 +74,4 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=20
6 changes: 5 additions & 1 deletion Kena/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: Kena
Bundle-SymbolicName: au.com.langdale.kena
Bundle-Version: 3.3.1.qualifier
Bundle-Vendor: Langdale Consultants
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-20
Bundle-ClassPath: kena.jar,
lib/arq-2.8.4.jar,
lib/icu4j-71.1.jar,
Expand Down Expand Up @@ -143,4 +143,8 @@ Export-Package: au.com.langdale.inference,
com.hp.hpl.jena.vocabulary.test,
com.hp.hpl.jena.xmloutput,
com.hp.hpl.jena.xmloutput.impl,
javax.xml.namespace,
org.apache.xerces.util
Automatic-Module-Name: au.com.langdale.kena
Import-Package: org.eclipse.core.runtime,
org.eclipse.swt.graphics
18 changes: 13 additions & 5 deletions Kena/src/au/com/langdale/inference/RuleParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@
import java.io.Reader;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URI;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;


import com.hp.hpl.jena.datatypes.DatatypeFormatException;
import com.hp.hpl.jena.datatypes.RDFDatatype;
import com.hp.hpl.jena.datatypes.TypeMapper;
Expand Down Expand Up @@ -61,10 +62,17 @@ public int getLine() {
private static InputStream openURL(String pathname) throws IOException,
MalformedURLException {
InputStream stream;
if( pathname.startsWith("/"))
if( pathname.startsWith("/")) {
stream = RuleParser.class.getResourceAsStream(pathname);
else
stream = new URL(pathname).openStream();

}
else {
Path path = Paths.get(pathname);
URI uri = path.toUri();
URL url = uri.toURL();
stream = url.openStream();

}

if( stream == null )
throw new IOException("resource could not be found:" + pathname);
Expand Down
2 changes: 1 addition & 1 deletion Kena/src/au/com/langdale/kena/OntModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ public void add(FrontsNode subject, FrontsNode prop, Node value) {
}

public void add(FrontsNode subject, FrontsNode prop, int value) {
graph.add(Triple.create(subject.asNode(), prop.asNode(), Node.createLiteral(LiteralLabelFactory.create(new Integer(value)))));
graph.add(Triple.create(subject.asNode(), prop.asNode(), Node.createLiteral(LiteralLabelFactory.create(Integer.valueOf(value)))));
}

public void remove(FrontsNode subject, FrontsNode prop, Node value) {
Expand Down
2 changes: 1 addition & 1 deletion Kena/src/au/com/langdale/sax/XMLReaderBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public void setFeature(String parm1, boolean parm2) throws SAXNotRecognizedExcep
if (!features.containsKey(parm1)) {
throw new SAXNotRecognizedException(parm1);
}
features.put(parm1, new Boolean(parm2));
features.put(parm1, Boolean.valueOf(parm2));
}


Expand Down
Binary file added ModelExtractor/.cache
Binary file not shown.
2 changes: 1 addition & 1 deletion RCPUtil/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
9 changes: 6 additions & 3 deletions RCPUtil/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=20
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.compliance=20
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=20
3 changes: 2 additions & 1 deletion RCPUtil/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui.workbench;bundle-version="3.5.0",
org.eclipse.ui.forms;bundle-version="3.4.0",
org.eclipse.core.resources;bundle-version="3.5.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-20
Bundle-ActivationPolicy: lazy
Export-Package: au.com.langdale.ui.binding;uses:="au.com.langdale.ui.builder,org.eclipse.jface.viewers,au.com.langdale.ui.plumbing",
au.com.langdale.ui.builder;
Expand Down Expand Up @@ -39,4 +39,5 @@ Export-Package: au.com.langdale.ui.binding;uses:="au.com.langdale.ui.builder,org
org.eclipse.core.resources,
org.eclipse.swt.widgets,
org.eclipse.core.runtime.jobs"
Automatic-Module-Name: au.com.langdale.rcputil

4 changes: 4 additions & 0 deletions RCPUtil/src/au/com/langdale/ui/builder/Templates.java
Original file line number Diff line number Diff line change
Expand Up @@ -974,6 +974,10 @@ public static Template Stack(Template a, Template b, Template c, Template d, Tem
public static Template Grid(GroupTemplate... groups) {
return new GridTemplate(groups);
}

public static Template GridArray(GroupTemplate[] groups) {
return new GridTemplate(groups);
}

public static Template Grid(GroupTemplate a) {
return new GridTemplate(new GroupTemplate[] { a });
Expand Down
6 changes: 3 additions & 3 deletions RCPUtil/src/au/com/langdale/util/Jobs.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.MessageDialog;
Expand Down Expand Up @@ -102,12 +102,12 @@ public final IStatus run(IProgressMonitor monitor) {
// First perform the clean
try {
monitor.beginTask("Cleaning and building project '" + project.getName() + "'", 1);
project.build(IncrementalProjectBuilder.CLEAN_BUILD, new SubProgressMonitor(monitor, 1));
project.build(IncrementalProjectBuilder.CLEAN_BUILD, SubMonitor.convert(monitor, 1));
} finally {
monitor.done();
}
// Then a build on the project
workspace.build(new IBuildConfiguration[] {project.getActiveBuildConfig()}, IncrementalProjectBuilder.INCREMENTAL_BUILD, false, new SubProgressMonitor(monitor, 10000));
workspace.build(new IBuildConfiguration[] {project.getActiveBuildConfig()}, IncrementalProjectBuilder.INCREMENTAL_BUILD, false, SubMonitor.convert(monitor, 10000));
if (monitor.isCanceled()) {
throw new OperationCanceledException();
}
Expand Down
Binary file added SKena/.cache
Binary file not shown.
6 changes: 3 additions & 3 deletions SKena/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ Bundle-Name: SKena
Bundle-SymbolicName: au.com.langdale.skena
Bundle-Version: 1.1.0.qualifier
Bundle-Vendor: Langdale Consultants
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.scala-ide.scala.library,
au.com.langdale.kena;visibility:=reexport
Bundle-RequiredExecutionEnvironment: JavaSE-20
Require-Bundle: au.com.langdale.kena;visibility:=reexport
Export-Package: au.com.langdale.skena,
au.com.langdale.skena.data,
au.com.langdale.skena.serializer,
au.com.langdale.skena.vocabulary
Automatic-Module-Name: au.com.langdale.skena
Binary file added ScalaRCP/.cache
Binary file not shown.
Loading