Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/code')
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.classpath7
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.gitignore2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.project33
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.settings/ca.ecliptical.pde.ds.prefs5
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/META-INF/MANIFEST.MF13
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.e4.ConfigurationModelCF.xml (renamed from bundles/code/org.eclipse.fx.code.editor.configuration.text/OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.internal.ConfigurationModelCF.xml)4
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/build.properties5
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/pom.xml34
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/src/org/eclipse/fx/code/editor/configuration/text/e4/ConfigurationModelCF.java (renamed from bundles/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/internal/ConfigurationModelCF.java)2
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/ConfigurationPresentationReconciler.java (renamed from bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/internal/ConfigurationPresentationReconciler.java)3
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/ConfigurationPresentationReconcilerTypeProvider.java1
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.configuration.text/META-INF/MANIFEST.MF4
13 files changed, 112 insertions, 8 deletions
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.classpath b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.classpath
new file mode 100644
index 000000000..eca7bdba8
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.classpath
@@ -0,0 +1,7 @@
+<?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.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.gitignore b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.gitignore
new file mode 100644
index 000000000..09e3bc9b2
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.gitignore
@@ -0,0 +1,2 @@
+/bin/
+/target/
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.project b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.project
new file mode 100644
index 000000000..86e7a2b98
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.fx.code.editor.configuration.text.e4</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>
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.settings/ca.ecliptical.pde.ds.prefs b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.settings/ca.ecliptical.pde.ds.prefs
new file mode 100644
index 000000000..963a30719
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.settings/ca.ecliptical.pde.ds.prefs
@@ -0,0 +1,5 @@
+eclipse.preferences.version=1
+enabled=true
+path=OSGI-INF/services
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=error
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.settings/org.eclipse.jdt.core.prefs b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..0c68a61dc
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/META-INF/MANIFEST.MF
new file mode 100644
index 000000000..71d7643a4
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/META-INF/MANIFEST.MF
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: E4
+Bundle-SymbolicName: org.eclipse.fx.code.editor.configuration.text.e4
+Bundle-Version: 2.2.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: org.eclipse.e4.core.contexts;bundle-version="1.4.0"
+Import-Package: org.eclipse.fx.code.editor;version="2.2.0",
+ org.eclipse.fx.code.editor.configuration,
+ org.eclipse.fx.code.editor.configuration.text,
+ org.osgi.service.component.annotations
+Service-Component: OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.e4.ConfigurationModelCF.xml
+Bundle-ActivationPolicy: lazy
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text/OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.internal.ConfigurationModelCF.xml b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.e4.ConfigurationModelCF.xml
index 911c1d14d..364c87295 100644
--- a/bundles/code/org.eclipse.fx.code.editor.configuration.text/OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.internal.ConfigurationModelCF.xml
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.e4.ConfigurationModelCF.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0" name="org.eclipse.fx.code.editor.configuration.text.internal.ConfigurationModelCF">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.2.0" name="org.eclipse.fx.code.editor.configuration.text.e4.ConfigurationModelCF">
<property name="service.context.key" value="org.eclipse.fx.code.editor.configuration.LanguageDef"/>
<service>
<provide interface="org.eclipse.e4.core.contexts.IContextFunction"/>
</service>
<reference bind="registerProvider" cardinality="0..n" interface="org.eclipse.fx.code.editor.configuration.text.ConfigurationModelProvider" name="registerProvider" policy="dynamic" policy-option="greedy" unbind="unregisterProvider"/>
- <implementation class="org.eclipse.fx.code.editor.configuration.text.internal.ConfigurationModelCF"/>
+ <implementation class="org.eclipse.fx.code.editor.configuration.text.e4.ConfigurationModelCF"/>
</scr:component> \ No newline at end of file
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/build.properties b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/build.properties
new file mode 100644
index 000000000..c58ea2178
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/build.properties
@@ -0,0 +1,5 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ OSGI-INF/
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/pom.xml b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/pom.xml
new file mode 100644
index 000000000..42b58d169
--- /dev/null
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/pom.xml
@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <name>e(fx)clipse - Runtime - Code - JSON UI Toolkit Independent Config e4 integration</name>
+ <groupId>org.eclipse.fx.runtime</groupId>
+ <artifactId>org.eclipse.fx.code.editor.configuration.text.e4</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+ <parent>
+ <groupId>org.eclipse.fx</groupId>
+ <artifactId>releng</artifactId>
+ <relativePath>../../../releng/org.eclipse.fx.releng/pom.xml</relativePath>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+
+ <build>
+ <resources>
+ <!-- to ensure that the feature lookup of the ui test works -->
+ <resource>
+ <directory>.</directory>
+ <includes>
+ <include>META-INF/</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/internal/ConfigurationModelCF.java b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/src/org/eclipse/fx/code/editor/configuration/text/e4/ConfigurationModelCF.java
index 9024a3501..adaab64ac 100644
--- a/bundles/code/org.eclipse.fx.code.editor.configuration.text/src/org/eclipse/fx/code/editor/configuration/text/internal/ConfigurationModelCF.java
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text.e4/src/org/eclipse/fx/code/editor/configuration/text/e4/ConfigurationModelCF.java
@@ -1,4 +1,4 @@
-package org.eclipse.fx.code.editor.configuration.text.internal;
+package org.eclipse.fx.code.editor.configuration.text.e4;
import java.util.ArrayList;
import java.util.List;
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/internal/ConfigurationPresentationReconciler.java b/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/ConfigurationPresentationReconciler.java
index 8241f6e68..52b01bdfa 100644
--- a/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/internal/ConfigurationPresentationReconciler.java
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/ConfigurationPresentationReconciler.java
@@ -1,9 +1,10 @@
-package org.eclipse.fx.code.editor.configuration.text.fx.internal;
+package org.eclipse.fx.code.editor.configuration.text.fx;
import javax.inject.Inject;
import org.eclipse.fx.code.editor.configuration.LanguageDef;
import org.eclipse.fx.code.editor.configuration.Partition;
+import org.eclipse.fx.code.editor.configuration.text.fx.internal.ConfigurationRuleScanner;
import org.eclipse.fx.text.ui.presentation.PresentationReconciler;
import org.eclipse.fx.text.ui.rules.DefaultDamagerRepairer;
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/ConfigurationPresentationReconcilerTypeProvider.java b/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/ConfigurationPresentationReconcilerTypeProvider.java
index 7722011cb..7e174ea26 100644
--- a/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/ConfigurationPresentationReconcilerTypeProvider.java
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text.fx/src/org/eclipse/fx/code/editor/configuration/text/fx/ConfigurationPresentationReconcilerTypeProvider.java
@@ -5,7 +5,6 @@ import java.util.Map;
import org.eclipse.fx.code.editor.Input;
import org.eclipse.fx.code.editor.configuration.text.ConfigurationModelDependentTypeProvider;
import org.eclipse.fx.code.editor.configuration.text.ConfigurationModelProvider;
-import org.eclipse.fx.code.editor.configuration.text.fx.internal.ConfigurationPresentationReconciler;
import org.eclipse.fx.code.editor.fx.services.PresentationReconcilerTypeProvider;
import org.eclipse.fx.text.ui.presentation.PresentationReconciler;
import org.osgi.service.component.annotations.Component;
diff --git a/bundles/code/org.eclipse.fx.code.editor.configuration.text/META-INF/MANIFEST.MF b/bundles/code/org.eclipse.fx.code.editor.configuration.text/META-INF/MANIFEST.MF
index 79d5902b0..b449c69c2 100644
--- a/bundles/code/org.eclipse.fx.code.editor.configuration.text/META-INF/MANIFEST.MF
+++ b/bundles/code/org.eclipse.fx.code.editor.configuration.text/META-INF/MANIFEST.MF
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.eclipse.fx.code.editor.configuration.text
Bundle-Version: 2.2.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.inject;version="1.0.0",
- org.eclipse.e4.core.contexts,
org.eclipse.fx.code.editor,
org.eclipse.fx.code.editor.configuration,
org.eclipse.fx.code.editor.services;version="2.2.0",
@@ -15,7 +14,6 @@ Import-Package: javax.inject;version="1.0.0",
org.eclipse.jface.text.rules,
org.osgi.service.component.annotations;version="1.2.0"
Require-Bundle: org.eclipse.text;bundle-version="3.5.400"
-Service-Component: OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.internal.ConfigurationModelCF.xml,
- OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.internal.ConfigurationDocumentPartitionerProvider.xml
+Service-Component: OSGI-INF/services/org.eclipse.fx.code.editor.configuration.text.internal.ConfigurationDocumentPartitionerProvider.xml
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.fx.code.editor.configuration.text

Back to the top