Permalink
Browse files

Split plugins into core+ui and rename to org.eclipse.editorconfig.

  • Loading branch information...
1 parent 8b9634f commit a5e21ab73c32ba45e73e44796dcbe1fa7bcfddfb angelozerr committed with May 25, 2016
Showing with 363 additions and 114 deletions.
  1. +2 −2 .gitmodules
  2. +5 −1 editorconfig-eclipse-feature/feature.xml
  3. +0 −11 editorconfig-eclipse-plugin/META-INF/MANIFEST.MF
  4. +14 −0 org.eclipse.editorconfig.core/META-INF/MANIFEST.MF
  5. +2 −2 {editorconfig-eclipse-plugin → org.eclipse.editorconfig.core}/build.properties
  6. 0 {editorconfig-eclipse-plugin → org.eclipse.editorconfig.core}/editorconfig-core-java
  7. +22 −0 org.eclipse.editorconfig.core/plugin.properties
  8. +5 −0 org.eclipse.editorconfig.core/plugin.xml
  9. +77 −0 org.eclipse.editorconfig.core/pom.xml
  10. +1 −1 ... → org.eclipse.editorconfig.core/src/main/java/org/eclipse}/editorconfig/core/ConfigProperty.java
  11. +1 −1 ...rg.eclipse.editorconfig.core/src/main/java/org/eclipse}/editorconfig/core/ConfigPropertyType.java
  12. +1 −1 ...eclipse.editorconfig.core/src/main/java/org/eclipse}/editorconfig/core/ConfigPropertyVisitor.java
  13. +1 −1 ...nes → org.eclipse.editorconfig.core/src/main/java/org/eclipse}/editorconfig/core/Displayable.java
  14. +1 −1 ...g.eclipse.editorconfig.core/src/main/java/org/eclipse}/editorconfig/core/EditorConfigService.java
  15. +1 −1 ... org.eclipse.editorconfig.core/src/main/java/org/eclipse}/editorconfig/core/EditorFileConfig.java
  16. +1 −1 ...→ org.eclipse.editorconfig.core/src/main/java/org/eclipse}/editorconfig/core/EndOfLineOption.java
  17. +1 −1 ...→ org.eclipse.editorconfig.core/src/main/java/org/eclipse}/editorconfig/core/EnumValueParser.java
  18. +1 −1 ...org.eclipse.editorconfig.core/src/main/java/org/eclipse}/editorconfig/core/IndentStyleOption.java
  19. +1 −1 ...nes → org.eclipse.editorconfig.core/src/main/java/org/eclipse}/editorconfig/core/ValueParser.java
  20. +1 −1 ...s → org.eclipse.editorconfig.core/src/main/java/org/eclipse}/editorconfig/core/ValueRenderer.java
  21. +44 −0 ...ditorconfig.core/src/main/java/org/eclipse/editorconfig/internal/core/EditorConfigCorePlugin.java
  22. +1 −1 ...eclipse.editorconfig.core/src/test/java/org/eclipse}/editorconfig/core/ConfigPropertyMatcher.java
  23. +9 −9 ...rg.eclipse.editorconfig.core/src/test/java/org/eclipse}/editorconfig/core/ConfigPropertyTest.java
  24. +8 −10 ...clipse.editorconfig.core/src/test/java/org/eclipse}/editorconfig/core/ConfigPropertyTypeTest.java
  25. +14 −14 ...onfig.core/src/test/java/org/eclipse}/editorconfig/core/EditorConfigServiceParamaterizedTest.java
  26. +12 −12 ...lipse.editorconfig.core/src/test/java/org/eclipse}/editorconfig/core/EditorConfigServiceTest.java
  27. +1 −1 ...g.eclipse.editorconfig.core/src/test/java/org/eclipse}/editorconfig/core/EndOfLineOptionTest.java
  28. +1 −3 ...cjones → org.eclipse.editorconfig.core/src/test/java/org/eclipse}/editorconfig/core/Matchers.java
  29. +15 −0 org.eclipse.editorconfig.ui/META-INF/MANIFEST.MF
  30. +7 −0 org.eclipse.editorconfig.ui/build.properties
  31. BIN {editorconfig-eclipse-plugin → org.eclipse.editorconfig.ui}/iconbank/favicon.ico
  32. BIN {editorconfig-eclipse-plugin → org.eclipse.editorconfig.ui}/icons/favicon_top_right_corner_file.png
  33. +22 −0 org.eclipse.editorconfig.ui/plugin.properties
  34. +19 −16 {editorconfig-eclipse-plugin → org.eclipse.editorconfig.ui}/plugin.xml
  35. +1 −1 {editorconfig-eclipse-plugin → org.eclipse.editorconfig.ui}/pom.xml
  36. +1 −1 ....editorconfig.ui/src/main/java/org/eclipse/editorconfig/internal/ui}/EditorActivationHandler.java
  37. +1 −1 ...fig.ui/src/main/java/org/eclipse/editorconfig/internal/ui}/EditorActivationSelectionListener.java
  38. +3 −4 ...ditorconfig.ui/src/main/java/org/eclipse/editorconfig/internal/ui/EditorConfigEclipseStartup.java
  39. +7 −8 ...g.ui/src/main/java/org/eclipse/editorconfig/internal/ui}/EditorConfigEditorActivationHandler.java
  40. +4 −5 ...editorconfig.ui/src/main/java/org/eclipse/editorconfig/internal/ui}/EditorConfigPropertyPage.java
  41. +53 −0 ...ipse.editorconfig.ui/src/main/java/org/eclipse/editorconfig/internal/ui/EditorConfigUIPlugin.java
  42. +2 −1 pom.xml
View
@@ -1,3 +1,3 @@
-[submodule "editorconfig-core-java"]
- path = editorconfig-eclipse-plugin/editorconfig-core-java
+[submodule "org.eclipse.editorconfig.core/editorconfig-core-java"]
+ path = org.eclipse.editorconfig.core/editorconfig-core-java
url = git@github.com:editorconfig/editorconfig-core-java.git
@@ -19,9 +19,13 @@ Visit http://editorconfig.org/ for more info.
Apache License, Version 2.0
</license>
- <plugin id="editorconfig-eclipse"
+ <plugin id="org.eclipse.editorconfig.core"
version="0.3.0"
unpack="false"/>
+ <plugin id="org.eclipse.editorconfig.ui"
+ version="0.3.0"
+ unpack="false"/>
+
</feature>
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: EditorConfig Eclipse
-Bundle-SymbolicName: editorconfig-eclipse;singleton:=true
-Bundle-Version: 0.3.0.qualifier
-Bundle-Vendor: Nathan Jones
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.ui.editors
@@ -0,0 +1,14 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-SymbolicName: org.eclipse.editorconfig.core;singleton:=true
+Bundle-Version: 0.3.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.core.resources,
+ org.eclipse.core.runtime
+Export-Package: org.eclipse.editorconfig.core,
+ org.editorconfig.core
+Bundle-Activator: org.eclipse.editorconfig.internal.core.EditorConfigCorePlugin
+Bundle-ActivationPolicy: lazy
@@ -3,5 +3,5 @@ source.. = src/main/java/,\
output.. = bin/
bin.includes = META-INF/,\
.,\
- icons/,\
- plugin.xml
+ plugin.xml,\
+ plugin.properties
@@ -0,0 +1,22 @@
+###############################################################################
+# Copyright 2014 Nathan Jones and others.
+#
+# This file is part of "EditorConfig Eclipse".
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Contributors:
+# Angelo Zerr <angelo.zerr@gmail.com> - Initial API and implementation
+###############################################################################
+pluginName=EditorConfig - Core
+providerName=Nathan Jones
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+</plugin>
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>com.ncjones</groupId>
+ <artifactId>editorconfig-eclipse-parent</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>org.eclipse.editorconfig.core</artifactId>
+ <packaging>eclipse-plugin</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>1.10.8</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>1.3</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testSourceDirectory>src/test/java</testSourceDirectory>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.18.1</version>
+ <executions>
+ <execution>
+ <id>test</id>
+ <phase>test</phase>
+ <configuration>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </configuration>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.5.1</version>
+ <executions>
+ <execution>
+ <id>compiletests</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+
+</project>
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ncjones.editorconfig.core;
+package org.eclipse.editorconfig.core;
public class ConfigProperty<T> {
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ncjones.editorconfig.core;
+package org.eclipse.editorconfig.core;
import java.util.HashMap;
import java.util.Map;
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ncjones.editorconfig.core;
+package org.eclipse.editorconfig.core;
public interface ConfigPropertyVisitor {
@@ -1,4 +1,4 @@
-package com.ncjones.editorconfig.core;
+package org.eclipse.editorconfig.core;
interface Displayable {
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ncjones.editorconfig.core;
+package org.eclipse.editorconfig.core;
import java.util.Collections;
import java.util.Comparator;
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ncjones.editorconfig.core;
+package org.eclipse.editorconfig.core;
import java.util.Set;
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ncjones.editorconfig.core;
+package org.eclipse.editorconfig.core;
public enum EndOfLineOption implements Displayable {
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ncjones.editorconfig.core;
+package org.eclipse.editorconfig.core;
class EnumValueParser<T extends Enum<T>> implements ValueParser<T> {
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ncjones.editorconfig.core;
+package org.eclipse.editorconfig.core;
public enum IndentStyleOption implements Displayable {
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ncjones.editorconfig.core;
+package org.eclipse.editorconfig.core;
interface ValueParser<T> {
@@ -1,4 +1,4 @@
-package com.ncjones.editorconfig.core;
+package org.eclipse.editorconfig.core;
interface ValueRenderer {
final ValueRenderer TO_STRING_VALUE_RENDERER = new ValueRenderer() {
@@ -0,0 +1,44 @@
+package org.eclipse.editorconfig.internal.core;
+
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class EditorConfigCorePlugin extends Plugin {
+
+ public static final String PLUGIN_ID = "org.eclipse.editorconfig.core"; //$NON-NLS-1$
+
+ // The shared instance.
+ private static EditorConfigCorePlugin plugin;
+
+ /**
+ * The constructor.
+ */
+ public EditorConfigCorePlugin() {
+ super();
+ plugin = this;
+ }
+
+ @Override
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ }
+
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static EditorConfigCorePlugin getDefault() {
+ return plugin;
+ }
+
+}
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ncjones.editorconfig.core;
+package org.eclipse.editorconfig.core;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
@@ -1,12 +1,12 @@
-package com.ncjones.editorconfig.core;
-
-import static com.ncjones.editorconfig.core.ConfigPropertyType.CHARSET;
-import static com.ncjones.editorconfig.core.ConfigPropertyType.END_OF_LINE;
-import static com.ncjones.editorconfig.core.ConfigPropertyType.INDENT_SIZE;
-import static com.ncjones.editorconfig.core.ConfigPropertyType.INDENT_STYLE;
-import static com.ncjones.editorconfig.core.ConfigPropertyType.INSERT_FINAL_NEWLINE;
-import static com.ncjones.editorconfig.core.ConfigPropertyType.TAB_WIDTH;
-import static com.ncjones.editorconfig.core.ConfigPropertyType.TRIM_TRAILING_WHITESPACE;
+package org.eclipse.editorconfig.core;
+
+import static org.eclipse.editorconfig.core.ConfigPropertyType.CHARSET;
+import static org.eclipse.editorconfig.core.ConfigPropertyType.END_OF_LINE;
+import static org.eclipse.editorconfig.core.ConfigPropertyType.INDENT_SIZE;
+import static org.eclipse.editorconfig.core.ConfigPropertyType.INDENT_STYLE;
+import static org.eclipse.editorconfig.core.ConfigPropertyType.INSERT_FINAL_NEWLINE;
+import static org.eclipse.editorconfig.core.ConfigPropertyType.TAB_WIDTH;
+import static org.eclipse.editorconfig.core.ConfigPropertyType.TRIM_TRAILING_WHITESPACE;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
@@ -15,15 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.ncjones.editorconfig.core;
+package org.eclipse.editorconfig.core;
-import static com.ncjones.editorconfig.core.ConfigPropertyType.CHARSET;
-import static com.ncjones.editorconfig.core.ConfigPropertyType.END_OF_LINE;
-import static com.ncjones.editorconfig.core.ConfigPropertyType.INDENT_SIZE;
-import static com.ncjones.editorconfig.core.ConfigPropertyType.INDENT_STYLE;
-import static com.ncjones.editorconfig.core.ConfigPropertyType.INSERT_FINAL_NEWLINE;
-import static com.ncjones.editorconfig.core.ConfigPropertyType.TAB_WIDTH;
-import static com.ncjones.editorconfig.core.ConfigPropertyType.TRIM_TRAILING_WHITESPACE;
+import static org.eclipse.editorconfig.core.ConfigPropertyType.CHARSET;
+import static org.eclipse.editorconfig.core.ConfigPropertyType.END_OF_LINE;
+import static org.eclipse.editorconfig.core.ConfigPropertyType.INDENT_SIZE;
+import static org.eclipse.editorconfig.core.ConfigPropertyType.INDENT_STYLE;
+import static org.eclipse.editorconfig.core.ConfigPropertyType.INSERT_FINAL_NEWLINE;
+import static org.eclipse.editorconfig.core.ConfigPropertyType.TAB_WIDTH;
+import static org.eclipse.editorconfig.core.ConfigPropertyType.TRIM_TRAILING_WHITESPACE;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
@@ -35,8 +35,6 @@
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
-import com.ncjones.editorconfig.core.ConfigPropertyType;
-
@RunWith(Parameterized.class)
public class ConfigPropertyTypeTest {
Oops, something went wrong.

0 comments on commit a5e21ab

Please sign in to comment.