From 968ddcc0c0d65cf4d5a4a90c5739662c6e10f209 Mon Sep 17 00:00:00 2001 From: Tom Schindl Date: Mon, 16 Feb 2015 23:05:17 +0100 Subject: current source state of compensator --- .../feature.xml | 14 ++ ....fx.code.compensator.app.product.product.launch | 4 +- .../editor/hsl/internal/HSLComponent.java | 9 + .../css/dark-highlight.css | 5 + .../css/highlight.css | 5 + .../editor/java/JavaSourceConfiguration.java | 6 +- .../editor/java/scanner/AbstractJavaScanner.java | 2 + .../editor/java/scanner/IJavaColorConstants.java | 4 + .../editor/java/scanner/JavaCodeScanner.java | 36 ++- .../compensator/editor/internal/FileInput.java | 7 +- .../hsl/formatting/.HSLFormatter.xtendbin | Bin 0 -> 2235 bytes .../hsl/generator/.HSLGenerator.xtendbin | Bin 0 -> 2176 bytes .../hsl/scoping/.HSLScopeProvider.xtendbin | Bin 0 -> 1727 bytes .../hsl/validation/.HSLValidator.xtendbin | Bin 0 -> 1657 bytes .../feature.xml | 34 +++ .../model/Workbench.xcore | 9 + .../code/compensator/model/workbench/CISystem.java | 104 ++++++++ .../code/compensator/model/workbench/Module.java | 27 ++ .../code/compensator/model/workbench/Project.java | 44 ++++ .../model/workbench/impl/CISystemImpl.java | 272 +++++++++++++++++++++ .../model/workbench/impl/ModuleImpl.java | 54 ++++ .../model/workbench/impl/ProjectImpl.java | 91 +++++++ 22 files changed, 720 insertions(+), 7 deletions(-) create mode 100644 experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/formatting/.HSLFormatter.xtendbin create mode 100644 experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/generator/.HSLGenerator.xtendbin create mode 100644 experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/scoping/.HSLScopeProvider.xtendbin create mode 100644 experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/validation/.HSLValidator.xtendbin create mode 100644 experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/CISystem.java create mode 100644 experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/CISystemImpl.java (limited to 'experimental') diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.app.feature/feature.xml b/experimental/compensator/org.eclipse.fx.code.compensator.app.feature/feature.xml index 63f939a71..314a2c045 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.app.feature/feature.xml +++ b/experimental/compensator/org.eclipse.fx.code.compensator.app.feature/feature.xml @@ -648,4 +648,18 @@ version="0.0.0" unpack="false"/> + + + + diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.app.product/org.eclipse.fx.code.compensator.app.product.product.launch b/experimental/compensator/org.eclipse.fx.code.compensator.app.product/org.eclipse.fx.code.compensator.app.product.product.launch index 87c4a5544..2ce659a48 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.app.product/org.eclipse.fx.code.compensator.app.product.product.launch +++ b/experimental/compensator/org.eclipse.fx.code.compensator.app.product/org.eclipse.fx.code.compensator.app.product.product.launch @@ -2,13 +2,13 @@ - + - + diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/internal/HSLComponent.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/internal/HSLComponent.java index d1cc1c778..4faaa48a1 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/internal/HSLComponent.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.hsl/src/org/eclipse/fx/code/compensator/editor/hsl/internal/HSLComponent.java @@ -27,6 +27,7 @@ import java.util.Set; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import javafx.application.Platform; import javafx.collections.FXCollections; import javafx.collections.ObservableList; import javafx.collections.ObservableSet; @@ -155,6 +156,14 @@ public class HSLComponent implements PartitionerFactory, SourceViewerConfigurati } private void handleLanguage(Path directory) { + if( Platform.isFxApplicationThread() ) { + _handleLanguage(directory); + } else { + Platform.runLater(() -> _handleLanguage(directory)); + } + } + + private void _handleLanguage(Path directory) { Path propertyFile = directory.resolve("config.properties"); if( Files.exists(propertyFile) ) { Properties p = new Properties(); diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/css/dark-highlight.css b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/css/dark-highlight.css index 5275249a8..b5835da85 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/css/dark-highlight.css +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/css/dark-highlight.css @@ -12,6 +12,7 @@ .java.styled-text-area .java_annotation { -styled-text-color: rgb(200, 200, 200); + -fx-font-weight: bold; } .java.styled-text-area .java_keyword { @@ -56,4 +57,8 @@ .java.styled-text-area .java_doc_tag { -fx-fill: #74a567; -fx-font-weight: bold; +} + +.java.styled-text-area .java_number { + -styled-text-color: #7c986c; } \ No newline at end of file diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/css/highlight.css b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/css/highlight.css index ff6e06d23..a3f7d0873 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/css/highlight.css +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/css/highlight.css @@ -8,6 +8,7 @@ .java.styled-text-area .java_annotation { -styled-text-color: rgb(200, 200, 200); + -fx-font-weight: bold; } .java.styled-text-area .java_keyword { @@ -50,4 +51,8 @@ .java.styled-text-area .java_doc_tag { -styled-text-color: rgb(127, 127, 159); +} + +.java.styled-text-area .java_number { + -styled-text-color: rgb(42, 0, 255); } \ No newline at end of file diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/JavaSourceConfiguration.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/JavaSourceConfiguration.java index efe57c393..92324d324 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/JavaSourceConfiguration.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/JavaSourceConfiguration.java @@ -59,6 +59,11 @@ public class JavaSourceConfiguration extends SourceViewerConfiguration { private IAnnotationModel annotationModel; private List annotationPresenters; + public JavaSourceConfiguration() { + this(null,null,null, null); + } + + @Inject public JavaSourceConfiguration(Input input, @org.eclipse.e4.core.di.annotations.Optional ProposalComputer computer, @@ -98,7 +103,6 @@ public class JavaSourceConfiguration extends SourceViewerConfiguration { } private List computeProposals(Integer offset) { - System.err.println("Compute at: " + offset); Future> computedProposals = computer.get().compute(new ProposalContext(input, offset)); try { return computedProposals.get(); diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/AbstractJavaScanner.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/AbstractJavaScanner.java index d691eccc2..ed9c056e5 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/AbstractJavaScanner.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/AbstractJavaScanner.java @@ -65,6 +65,8 @@ public abstract class AbstractJavaScanner extends BufferedRuleBasedScanner { return new Token(new TextAttribute(IJavaColorConstants.JAVA_SINGLE_LINE_COMMENT)); case IJavaColorConstants.JAVADOC_TAG: return new Token(new TextAttribute(IJavaColorConstants.JAVADOC_TAG)); + case IJavaColorConstants.JAVA_NUMBER: + return new Token(new TextAttribute(IJavaColorConstants.JAVA_NUMBER)); default: throw new IllegalStateException("Unknown key '"+ key+"'"); } diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/IJavaColorConstants.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/IJavaColorConstants.java index 3b26c91d3..3a09e9a82 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/IJavaColorConstants.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/IJavaColorConstants.java @@ -137,6 +137,9 @@ public interface IJavaColorConstants { * (value "java_doc_default"). */ String JAVADOC_DEFAULT= "java_doc_default"; //$NON-NLS-1$ + + + String JAVA_NUMBER = "java_number"; //---------- Properties File Editor ---------- @@ -180,6 +183,7 @@ public interface IJavaColorConstants { * @since 3.1 */ String PROPERTIES_FILE_COLORING_ARGUMENT= "pf_coloring_argument"; //$NON-NLS-1$ + public static final String ANNOTATION="java_annotation"; //$NON-NLS-1$ } diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/JavaCodeScanner.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/JavaCodeScanner.java index 7d64811f2..babc05708 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/JavaCodeScanner.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor.java/src/org/eclipse/fx/code/compensator/editor/java/scanner/JavaCodeScanner.java @@ -114,6 +114,9 @@ public class JavaCodeScanner extends AbstractJavaScanner { combinedWordRule.addWordMatcher(wordRule); rules.add(combinedWordRule); + + token = getToken(IJavaColorConstants.JAVA_NUMBER); + rules.add(new NumberRule(token)); setDefaultReturnToken(defaultToken); return rules; @@ -241,11 +244,14 @@ public class JavaCodeScanner extends AbstractJavaScanner { if (readInterface(scanner)) { return fInterfaceToken; } else { - scanner.reset(); + while( Character.isJavaIdentifierPart(scanner.read()) ) { + } + scanner.unread(); +// scanner.reset(); return fAtToken; } } - + private boolean readInterface(ICharacterScanner scanner) { int ch= scanner.read(); int i= 0; @@ -276,6 +282,32 @@ public class JavaCodeScanner extends AbstractJavaScanner { } + private static final class NumberRule implements IRule { + private final IToken fToken; + + public NumberRule(IToken fToken) { + this.fToken = fToken; + } + + @Override + public IToken evaluate(ICharacterScanner scanner) { + int v = scanner.read(); + + if( Character.isDigit(v) ) { + while( (v = scanner.read()) != ICharacterScanner.EOF ) { + if( ! Character.isDigit(v) & v != '.' && v != '_' ) { + scanner.unread(); + break; + } + } + return fToken; + } else { + return Token.UNDEFINED; + } + } + + } + private static final class OperatorRule implements IRule { /** Java operators */ diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/internal/FileInput.java b/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/internal/FileInput.java index 7bf4af827..c564553c1 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/internal/FileInput.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.editor/src/org/eclipse/fx/code/compensator/editor/internal/FileInput.java @@ -15,12 +15,15 @@ import java.io.BufferedWriter; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.List; import javax.inject.Inject; +import javax.inject.Named; import org.eclipse.fx.code.compensator.editor.ContentTypeProvider; import org.eclipse.fx.code.compensator.editor.Input; +import org.eclipse.fx.code.compensator.editor.TextEditor; import org.eclipse.fx.code.compensator.editor.URIProvider; import org.eclipse.fx.code.compensator.editor.services.ContentTypeDetector; import org.eclipse.fx.core.URI; @@ -32,8 +35,8 @@ public class FileInput implements Input, ContentTypeProvider, URIProvide private final List detectorList; @Inject - public FileInput(Path path, @Service List detectorList) { - this.path = path; + public FileInput(@Named(TextEditor.DOCUMENT_URL) String url, @Service List detectorList) { + this.path = Paths.get(java.net.URI.create(url)); this.detectorList = detectorList; } diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/formatting/.HSLFormatter.xtendbin b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/formatting/.HSLFormatter.xtendbin new file mode 100644 index 000000000..e0c548f17 Binary files /dev/null and b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/formatting/.HSLFormatter.xtendbin differ diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/generator/.HSLGenerator.xtendbin b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/generator/.HSLGenerator.xtendbin new file mode 100644 index 000000000..c8c9e4d3b Binary files /dev/null and b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/generator/.HSLGenerator.xtendbin differ diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/scoping/.HSLScopeProvider.xtendbin b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/scoping/.HSLScopeProvider.xtendbin new file mode 100644 index 000000000..c15aad418 Binary files /dev/null and b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/scoping/.HSLScopeProvider.xtendbin differ diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/validation/.HSLValidator.xtendbin b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/validation/.HSLValidator.xtendbin new file mode 100644 index 000000000..e0eafcffc Binary files /dev/null and b/experimental/compensator/org.eclipse.fx.code.compensator.hsl/xtend-gen/org/eclipse/fx/code/compensator/hsl/validation/.HSLValidator.xtendbin differ diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.jdt.runtime.feature/feature.xml b/experimental/compensator/org.eclipse.fx.code.compensator.jdt.runtime.feature/feature.xml index 76c2c7cb0..f5af435a1 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.jdt.runtime.feature/feature.xml +++ b/experimental/compensator/org.eclipse.fx.code.compensator.jdt.runtime.feature/feature.xml @@ -67,4 +67,38 @@ version="0.0.0" unpack="false"/> + + + + + + + + + + diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/model/Workbench.xcore b/experimental/compensator/org.eclipse.fx.code.compensator.model/model/Workbench.xcore index 41b66c0b2..5cda8cd61 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.model/model/Workbench.xcore +++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/model/Workbench.xcore @@ -50,6 +50,8 @@ class Project extends ModuleContainer { String projectType String iconURI contains BugTracker[0..*] bugTrackerList + contains CISystem[0..*] ciSystemList + transient Object userdata } class RemoteProject extends Project { @@ -80,4 +82,11 @@ class BugTracker { class Module extends ModuleContainer { String name String rootFolderUrl + transient Object userdata +} + +class CISystem { + String typeId + String label + String serviceUrl } \ No newline at end of file diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/CISystem.java b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/CISystem.java new file mode 100644 index 000000000..ac5148ece --- /dev/null +++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/CISystem.java @@ -0,0 +1,104 @@ +/** + */ +package org.eclipse.fx.code.compensator.model.workbench; + +import org.eclipse.emf.ecore.EObject; + +/** + * + * A representation of the model object 'CI System'. + * + * + *

+ * The following features are supported: + *

+ *
    + *
  • {@link org.eclipse.fx.code.compensator.model.workbench.CISystem#getTypeId Type Id}
    • + *
  • {@link org.eclipse.fx.code.compensator.model.workbench.CISystem#getLabel Label}
    • + *
  • {@link org.eclipse.fx.code.compensator.model.workbench.CISystem#getServiceUrl Service Url}
    • + *
+ * + * @see org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage#getCISystem() + * @model + * @generated + */ +public interface CISystem extends EObject { + /** + * Returns the value of the 'Type Id' attribute. + * + *

+ * If the meaning of the 'Type Id' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Type Id' attribute. + * @see #setTypeId(String) + * @see org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage#getCISystem_TypeId() + * @model unique="false" + * @generated + */ + String getTypeId(); + + /** + * Sets the value of the '{@link org.eclipse.fx.code.compensator.model.workbench.CISystem#getTypeId Type Id}' attribute. + * + * + * @param value the new value of the 'Type Id' attribute. + * @see #getTypeId() + * @generated + */ + void setTypeId(String value); + + /** + * Returns the value of the 'Label' attribute. + * + *

+ * If the meaning of the 'Label' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Label' attribute. + * @see #setLabel(String) + * @see org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage#getCISystem_Label() + * @model unique="false" + * @generated + */ + String getLabel(); + + /** + * Sets the value of the '{@link org.eclipse.fx.code.compensator.model.workbench.CISystem#getLabel Label}' attribute. + * + * + * @param value the new value of the 'Label' attribute. + * @see #getLabel() + * @generated + */ + void setLabel(String value); + + /** + * Returns the value of the 'Service Url' attribute. + * + *

+ * If the meaning of the 'Service Url' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Service Url' attribute. + * @see #setServiceUrl(String) + * @see org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage#getCISystem_ServiceUrl() + * @model unique="false" + * @generated + */ + String getServiceUrl(); + + /** + * Sets the value of the '{@link org.eclipse.fx.code.compensator.model.workbench.CISystem#getServiceUrl Service Url}' attribute. + * + * + * @param value the new value of the 'Service Url' attribute. + * @see #getServiceUrl() + * @generated + */ + void setServiceUrl(String value); + +} // CISystem diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/Module.java b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/Module.java index e36847a45..454dd857a 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/Module.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/Module.java @@ -14,6 +14,7 @@ package org.eclipse.fx.code.compensator.model.workbench; *
    *
  • {@link org.eclipse.fx.code.compensator.model.workbench.Module#getName Name}
    • *
  • {@link org.eclipse.fx.code.compensator.model.workbench.Module#getRootFolderUrl Root Folder Url}
    • + *
  • {@link org.eclipse.fx.code.compensator.model.workbench.Module#getUserdata Userdata}
    • *
* * @see org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage#getModule() @@ -73,4 +74,30 @@ public interface Module extends ModuleContainer { */ void setRootFolderUrl(String value); + /** + * Returns the value of the 'Userdata' attribute. + * + *

+ * If the meaning of the 'Userdata' attribute isn't clear, + * there really should be more of a description here... + *

+ * + * @return the value of the 'Userdata' attribute. + * @see #setUserdata(Object) + * @see org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage#getModule_Userdata() + * @model unique="false" transient="true" + * @generated + */ + Object getUserdata(); + + /** + * Sets the value of the '{@link org.eclipse.fx.code.compensator.model.workbench.Module#getUserdata Userdata}' attribute. + * + * + * @param value the new value of the 'Userdata' attribute. + * @see #getUserdata() + * @generated + */ + void setUserdata(Object value); + } // Module diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/Project.java b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/Project.java index ddd22576e..bc0419fa6 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/Project.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/Project.java @@ -18,6 +18,8 @@ import org.eclipse.emf.common.util.EList; *
  • {@link org.eclipse.fx.code.compensator.model.workbench.Project#getProjectType Project Type}
    • *
  • {@link org.eclipse.fx.code.compensator.model.workbench.Project#getIconURI Icon URI}
    • *
  • {@link org.eclipse.fx.code.compensator.model.workbench.Project#getBugTrackerList Bug Tracker List}
    • + *
  • {@link org.eclipse.fx.code.compensator.model.workbench.Project#getCiSystemList Ci System List}
    • + *
  • {@link org.eclipse.fx.code.compensator.model.workbench.Project#getUserdata Userdata}
    • * * * @see org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage#getProject() @@ -145,4 +147,46 @@ public interface Project extends ModuleContainer { */ EList getBugTrackerList(); + /** + * Returns the value of the 'Ci System List' containment reference list. + * The list contents are of type {@link org.eclipse.fx.code.compensator.model.workbench.CISystem}. + * + *

    + * If the meaning of the 'Ci System List' containment reference list isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Ci System List' containment reference list. + * @see org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage#getProject_CiSystemList() + * @model containment="true" + * @generated + */ + EList getCiSystemList(); + + /** + * Returns the value of the 'Userdata' attribute. + * + *

    + * If the meaning of the 'Userdata' attribute isn't clear, + * there really should be more of a description here... + *

    + * + * @return the value of the 'Userdata' attribute. + * @see #setUserdata(Object) + * @see org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage#getProject_Userdata() + * @model unique="false" transient="true" + * @generated + */ + Object getUserdata(); + + /** + * Sets the value of the '{@link org.eclipse.fx.code.compensator.model.workbench.Project#getUserdata Userdata}' attribute. + * + * + * @param value the new value of the 'Userdata' attribute. + * @see #getUserdata() + * @generated + */ + void setUserdata(Object value); + } // Project diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/CISystemImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/CISystemImpl.java new file mode 100644 index 000000000..67efa9ac6 --- /dev/null +++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/CISystemImpl.java @@ -0,0 +1,272 @@ +/** + */ +package org.eclipse.fx.code.compensator.model.workbench.impl; + +import org.eclipse.emf.common.notify.Notification; + +import org.eclipse.emf.ecore.EClass; + +import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; + +import org.eclipse.fx.code.compensator.model.workbench.CISystem; +import org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage; + +/** + * + * An implementation of the model object 'CI System'. + * + *

    + *

    + * The following features are implemented: + *

    + *
      + *
    • {@link org.eclipse.fx.code.compensator.model.workbench.impl.CISystemImpl#getTypeId Type Id}
      • + *
    • {@link org.eclipse.fx.code.compensator.model.workbench.impl.CISystemImpl#getLabel Label}
      • + *
    • {@link org.eclipse.fx.code.compensator.model.workbench.impl.CISystemImpl#getServiceUrl Service Url}
      • + *
    + * + * @generated + */ +public class CISystemImpl extends MinimalEObjectImpl.Container implements CISystem { + /** + * The default value of the '{@link #getTypeId() Type Id}' attribute. + * + * + * @see #getTypeId() + * @generated + * @ordered + */ + protected static final String TYPE_ID_EDEFAULT = null; + + /** + * The cached value of the '{@link #getTypeId() Type Id}' attribute. + * + * + * @see #getTypeId() + * @generated + * @ordered + */ + protected String typeId = TYPE_ID_EDEFAULT; + + /** + * The default value of the '{@link #getLabel() Label}' attribute. + * + * + * @see #getLabel() + * @generated + * @ordered + */ + protected static final String LABEL_EDEFAULT = null; + + /** + * The cached value of the '{@link #getLabel() Label}' attribute. + * + * + * @see #getLabel() + * @generated + * @ordered + */ + protected String label = LABEL_EDEFAULT; + + /** + * The default value of the '{@link #getServiceUrl() Service Url}' attribute. + * + * + * @see #getServiceUrl() + * @generated + * @ordered + */ + protected static final String SERVICE_URL_EDEFAULT = null; + + /** + * The cached value of the '{@link #getServiceUrl() Service Url}' attribute. + * + * + * @see #getServiceUrl() + * @generated + * @ordered + */ + protected String serviceUrl = SERVICE_URL_EDEFAULT; + + /** + * + * + * @generated + */ + protected CISystemImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return WorkbenchPackage.Literals.CI_SYSTEM; + } + + /** + * + * + * @generated + */ + public String getTypeId() { + return typeId; + } + + /** + * + * + * @generated + */ + public void setTypeId(String newTypeId) { + String oldTypeId = typeId; + typeId = newTypeId; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, WorkbenchPackage.CI_SYSTEM__TYPE_ID, oldTypeId, typeId)); + } + + /** + * + * + * @generated + */ + public String getLabel() { + return label; + } + + /** + * + * + * @generated + */ + public void setLabel(String newLabel) { + String oldLabel = label; + label = newLabel; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, WorkbenchPackage.CI_SYSTEM__LABEL, oldLabel, label)); + } + + /** + * + * + * @generated + */ + public String getServiceUrl() { + return serviceUrl; + } + + /** + * + * + * @generated + */ + public void setServiceUrl(String newServiceUrl) { + String oldServiceUrl = serviceUrl; + serviceUrl = newServiceUrl; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, WorkbenchPackage.CI_SYSTEM__SERVICE_URL, oldServiceUrl, serviceUrl)); + } + + /** + * + * + * @generated + */ + @Override + public Object eGet(int featureID, boolean resolve, boolean coreType) { + switch (featureID) { + case WorkbenchPackage.CI_SYSTEM__TYPE_ID: + return getTypeId(); + case WorkbenchPackage.CI_SYSTEM__LABEL: + return getLabel(); + case WorkbenchPackage.CI_SYSTEM__SERVICE_URL: + return getServiceUrl(); + } + return super.eGet(featureID, resolve, coreType); + } + + /** + * + * + * @generated + */ + @Override + public void eSet(int featureID, Object newValue) { + switch (featureID) { + case WorkbenchPackage.CI_SYSTEM__TYPE_ID: + setTypeId((String)newValue); + return; + case WorkbenchPackage.CI_SYSTEM__LABEL: + setLabel((String)newValue); + return; + case WorkbenchPackage.CI_SYSTEM__SERVICE_URL: + setServiceUrl((String)newValue); + return; + } + super.eSet(featureID, newValue); + } + + /** + * + * + * @generated + */ + @Override + public void eUnset(int featureID) { + switch (featureID) { + case WorkbenchPackage.CI_SYSTEM__TYPE_ID: + setTypeId(TYPE_ID_EDEFAULT); + return; + case WorkbenchPackage.CI_SYSTEM__LABEL: + setLabel(LABEL_EDEFAULT); + return; + case WorkbenchPackage.CI_SYSTEM__SERVICE_URL: + setServiceUrl(SERVICE_URL_EDEFAULT); + return; + } + super.eUnset(featureID); + } + + /** + * + * + * @generated + */ + @Override + public boolean eIsSet(int featureID) { + switch (featureID) { + case WorkbenchPackage.CI_SYSTEM__TYPE_ID: + return TYPE_ID_EDEFAULT == null ? typeId != null : !TYPE_ID_EDEFAULT.equals(typeId); + case WorkbenchPackage.CI_SYSTEM__LABEL: + return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label); + case WorkbenchPackage.CI_SYSTEM__SERVICE_URL: + return SERVICE_URL_EDEFAULT == null ? serviceUrl != null : !SERVICE_URL_EDEFAULT.equals(serviceUrl); + } + return super.eIsSet(featureID); + } + + /** + * + * + * @generated + */ + @Override + public String toString() { + if (eIsProxy()) return super.toString(); + + StringBuffer result = new StringBuffer(super.toString()); + result.append(" (typeId: "); + result.append(typeId); + result.append(", label: "); + result.append(label); + result.append(", serviceUrl: "); + result.append(serviceUrl); + result.append(')'); + return result.toString(); + } + +} //CISystemImpl diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ModuleImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ModuleImpl.java index 4b8a1f964..1d5167113 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ModuleImpl.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ModuleImpl.java @@ -22,6 +22,7 @@ import org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage; *
      *
    • {@link org.eclipse.fx.code.compensator.model.workbench.impl.ModuleImpl#getName Name}
      • *
    • {@link org.eclipse.fx.code.compensator.model.workbench.impl.ModuleImpl#getRootFolderUrl Root Folder Url}
      • + *
    • {@link org.eclipse.fx.code.compensator.model.workbench.impl.ModuleImpl#getUserdata Userdata}
      • *
    * * @generated @@ -67,6 +68,26 @@ public class ModuleImpl extends ModuleContainerImpl implements Module { */ protected String rootFolderUrl = ROOT_FOLDER_URL_EDEFAULT; + /** + * The default value of the '{@link #getUserdata() Userdata}' attribute. + * + * + * @see #getUserdata() + * @generated + * @ordered + */ + protected static final Object USERDATA_EDEFAULT = null; + + /** + * The cached value of the '{@link #getUserdata() Userdata}' attribute. + * + * + * @see #getUserdata() + * @generated + * @ordered + */ + protected Object userdata = USERDATA_EDEFAULT; + /** * * @@ -128,6 +149,27 @@ public class ModuleImpl extends ModuleContainerImpl implements Module { eNotify(new ENotificationImpl(this, Notification.SET, WorkbenchPackage.MODULE__ROOT_FOLDER_URL, oldRootFolderUrl, rootFolderUrl)); } + /** + * + * + * @generated + */ + public Object getUserdata() { + return userdata; + } + + /** + * + * + * @generated + */ + public void setUserdata(Object newUserdata) { + Object oldUserdata = userdata; + userdata = newUserdata; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, WorkbenchPackage.MODULE__USERDATA, oldUserdata, userdata)); + } + /** * * @@ -140,6 +182,8 @@ public class ModuleImpl extends ModuleContainerImpl implements Module { return getName(); case WorkbenchPackage.MODULE__ROOT_FOLDER_URL: return getRootFolderUrl(); + case WorkbenchPackage.MODULE__USERDATA: + return getUserdata(); } return super.eGet(featureID, resolve, coreType); } @@ -158,6 +202,9 @@ public class ModuleImpl extends ModuleContainerImpl implements Module { case WorkbenchPackage.MODULE__ROOT_FOLDER_URL: setRootFolderUrl((String)newValue); return; + case WorkbenchPackage.MODULE__USERDATA: + setUserdata(newValue); + return; } super.eSet(featureID, newValue); } @@ -176,6 +223,9 @@ public class ModuleImpl extends ModuleContainerImpl implements Module { case WorkbenchPackage.MODULE__ROOT_FOLDER_URL: setRootFolderUrl(ROOT_FOLDER_URL_EDEFAULT); return; + case WorkbenchPackage.MODULE__USERDATA: + setUserdata(USERDATA_EDEFAULT); + return; } super.eUnset(featureID); } @@ -192,6 +242,8 @@ public class ModuleImpl extends ModuleContainerImpl implements Module { return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name); case WorkbenchPackage.MODULE__ROOT_FOLDER_URL: return ROOT_FOLDER_URL_EDEFAULT == null ? rootFolderUrl != null : !ROOT_FOLDER_URL_EDEFAULT.equals(rootFolderUrl); + case WorkbenchPackage.MODULE__USERDATA: + return USERDATA_EDEFAULT == null ? userdata != null : !USERDATA_EDEFAULT.equals(userdata); } return super.eIsSet(featureID); } @@ -210,6 +262,8 @@ public class ModuleImpl extends ModuleContainerImpl implements Module { result.append(name); result.append(", rootFolderUrl: "); result.append(rootFolderUrl); + result.append(", userdata: "); + result.append(userdata); result.append(')'); return result.toString(); } diff --git a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ProjectImpl.java b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ProjectImpl.java index 6d1f29026..32a852258 100644 --- a/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ProjectImpl.java +++ b/experimental/compensator/org.eclipse.fx.code.compensator.model/src-gen/org/eclipse/fx/code/compensator/model/workbench/impl/ProjectImpl.java @@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.fx.code.compensator.model.workbench.BugTracker; +import org.eclipse.fx.code.compensator.model.workbench.CISystem; import org.eclipse.fx.code.compensator.model.workbench.Project; import org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage; @@ -35,6 +36,8 @@ import org.eclipse.fx.code.compensator.model.workbench.WorkbenchPackage; *
  • {@link org.eclipse.fx.code.compensator.model.workbench.impl.ProjectImpl#getProjectType Project Type}
    • *
  • {@link org.eclipse.fx.code.compensator.model.workbench.impl.ProjectImpl#getIconURI Icon URI}
    • *
  • {@link org.eclipse.fx.code.compensator.model.workbench.impl.ProjectImpl#getBugTrackerList Bug Tracker List}
    • + *
  • {@link org.eclipse.fx.code.compensator.model.workbench.impl.ProjectImpl#getCiSystemList Ci System List}
    • + *
  • {@link org.eclipse.fx.code.compensator.model.workbench.impl.ProjectImpl#getUserdata Userdata}
    • * * * @generated @@ -130,6 +133,36 @@ public class ProjectImpl extends ModuleContainerImpl implements Project { */ protected EList bugTrackerList; + /** + * The cached value of the '{@link #getCiSystemList() Ci System List}' containment reference list. + * + * + * @see #getCiSystemList() + * @generated + * @ordered + */ + protected EList ciSystemList; + + /** + * The default value of the '{@link #getUserdata() Userdata}' attribute. + * + * + * @see #getUserdata() + * @generated + * @ordered + */ + protected static final Object USERDATA_EDEFAULT = null; + + /** + * The cached value of the '{@link #getUserdata() Userdata}' attribute. + * + * + * @see #getUserdata() + * @generated + * @ordered + */ + protected Object userdata = USERDATA_EDEFAULT; + /** * * @@ -245,6 +278,39 @@ public class ProjectImpl extends ModuleContainerImpl implements Project { return bugTrackerList; } + /** + * + * + * @generated + */ + public EList getCiSystemList() { + if (ciSystemList == null) { + ciSystemList = new EObjectContainmentEList(CISystem.class, this, WorkbenchPackage.PROJECT__CI_SYSTEM_LIST); + } + return ciSystemList; + } + + /** + * + * + * @generated + */ + public Object getUserdata() { + return userdata; + } + + /** + * + * + * @generated + */ + public void setUserdata(Object newUserdata) { + Object oldUserdata = userdata; + userdata = newUserdata; + if (eNotificationRequired()) + eNotify(new ENotificationImpl(this, Notification.SET, WorkbenchPackage.PROJECT__USERDATA, oldUserdata, userdata)); + } + /** * * @@ -255,6 +321,8 @@ public class ProjectImpl extends ModuleContainerImpl implements Project { switch (featureID) { case WorkbenchPackage.PROJECT__BUG_TRACKER_LIST: return ((InternalEList)getBugTrackerList()).basicRemove(otherEnd, msgs); + case WorkbenchPackage.PROJECT__CI_SYSTEM_LIST: + return ((InternalEList)getCiSystemList()).basicRemove(otherEnd, msgs); } return super.eInverseRemove(otherEnd, featureID, msgs); } @@ -277,6 +345,10 @@ public class ProjectImpl extends ModuleContainerImpl implements Project { return getIconURI(); case WorkbenchPackage.PROJECT__BUG_TRACKER_LIST: return getBugTrackerList(); + case WorkbenchPackage.PROJECT__CI_SYSTEM_LIST: + return getCiSystemList(); + case WorkbenchPackage.PROJECT__USERDATA: + return getUserdata(); } return super.eGet(featureID, resolve, coreType); } @@ -306,6 +378,13 @@ public class ProjectImpl extends ModuleContainerImpl implements Project { getBugTrackerList().clear(); getBugTrackerList().addAll((Collection)newValue); return; + case WorkbenchPackage.PROJECT__CI_SYSTEM_LIST: + getCiSystemList().clear(); + getCiSystemList().addAll((Collection)newValue); + return; + case WorkbenchPackage.PROJECT__USERDATA: + setUserdata(newValue); + return; } super.eSet(featureID, newValue); } @@ -333,6 +412,12 @@ public class ProjectImpl extends ModuleContainerImpl implements Project { case WorkbenchPackage.PROJECT__BUG_TRACKER_LIST: getBugTrackerList().clear(); return; + case WorkbenchPackage.PROJECT__CI_SYSTEM_LIST: + getCiSystemList().clear(); + return; + case WorkbenchPackage.PROJECT__USERDATA: + setUserdata(USERDATA_EDEFAULT); + return; } super.eUnset(featureID); } @@ -355,6 +440,10 @@ public class ProjectImpl extends ModuleContainerImpl implements Project { return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI); case WorkbenchPackage.PROJECT__BUG_TRACKER_LIST: return bugTrackerList != null && !bugTrackerList.isEmpty(); + case WorkbenchPackage.PROJECT__CI_SYSTEM_LIST: + return ciSystemList != null && !ciSystemList.isEmpty(); + case WorkbenchPackage.PROJECT__USERDATA: + return USERDATA_EDEFAULT == null ? userdata != null : !USERDATA_EDEFAULT.equals(userdata); } return super.eIsSet(featureID); } @@ -377,6 +466,8 @@ public class ProjectImpl extends ModuleContainerImpl implements Project { result.append(projectType); result.append(", iconURI: "); result.append(iconURI); + result.append(", userdata: "); + result.append(userdata); result.append(')'); return result.toString(); } -- cgit v1.2.3