Skip to main content
summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorTom Schindl2015-10-16 19:41:04 -0400
committerTom Schindl2015-10-16 19:41:04 -0400
commit5216d3815f87293c7b07e8be3981cf1658fc1c34 (patch)
tree2ef4c7974e98508aa8badc90b2dff3aacc0111ef /demos
parent8f0c93b3bc24e2211fcc14d53c53b6779df3b8af (diff)
downloadorg.eclipse.efxclipse-5216d3815f87293c7b07e8be3981cf1658fc1c34.tar.gz
org.eclipse.efxclipse-5216d3815f87293c7b07e8be3981cf1658fc1c34.tar.xz
org.eclipse.efxclipse-5216d3815f87293c7b07e8be3981cf1658fc1c34.zip
adjust to latest changes
Diffstat (limited to 'demos')
-rw-r--r--demos/org.eclipse.fx.simplycode.app.feature/feature.xml35
-rw-r--r--demos/org.eclipse.fx.simplycode.app.product/org.eclipse.fx.simplycode.app.product.product.launch2
-rw-r--r--demos/org.eclipse.fx.simplycode.app/.project6
-rw-r--r--demos/org.eclipse.fx.simplycode.app/Application.e4xmi1
-rw-r--r--demos/org.eclipse.fx.simplycode.app/bin/org/eclipse/fx/simplycode/app/parts/ProjectExplorer.classbin0 -> 5618 bytes
-rw-r--r--demos/org.eclipse.fx.simplycode.app/bin/org/eclipse/fx/simplycode/app/themes/DefaultTheme.classbin0 -> 1756 bytes
-rw-r--r--demos/org.eclipse.fx.simplycode.app/css/default.css20
-rw-r--r--demos/org.eclipse.fx.simplycode.app/src/org/eclipse/fx/simplycode/app/parts/ProjectExplorer.java4
8 files changed, 64 insertions, 4 deletions
diff --git a/demos/org.eclipse.fx.simplycode.app.feature/feature.xml b/demos/org.eclipse.fx.simplycode.app.feature/feature.xml
index 85eacb534..cf7f8a062 100644
--- a/demos/org.eclipse.fx.simplycode.app.feature/feature.xml
+++ b/demos/org.eclipse.fx.simplycode.app.feature/feature.xml
@@ -224,4 +224,39 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="at.bestsolution.asciidocj"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="at.bestsolution.code.editor.asciidoc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.fx.code.editor.asciidoc"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.fx.code.editor.asciidoc.fx"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.fx.code.editor.asciidoc.fx.e4"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/demos/org.eclipse.fx.simplycode.app.product/org.eclipse.fx.simplycode.app.product.product.launch b/demos/org.eclipse.fx.simplycode.app.product/org.eclipse.fx.simplycode.app.product.product.launch
index 3a1315d08..8acac93d6 100644
--- a/demos/org.eclipse.fx.simplycode.app.product/org.eclipse.fx.simplycode.app.product.product.launch
+++ b/demos/org.eclipse.fx.simplycode.app.product/org.eclipse.fx.simplycode.app.product.product.launch
@@ -18,7 +18,7 @@
<stringAttribute key="location" value="${workspace_loc}/../runtime-org.eclipse.fx.simplycode.app.product"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nl ${target.nl} -consoleLog -nosplash"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nl ${target.nl} -consoleLog -nosplash -console"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.osgi.framework.bundle.parent=ext"/>
<stringAttribute key="pde.version" value="3.3"/>
diff --git a/demos/org.eclipse.fx.simplycode.app/.project b/demos/org.eclipse.fx.simplycode.app/.project
index 550d3e96f..780058ca4 100644
--- a/demos/org.eclipse.fx.simplycode.app/.project
+++ b/demos/org.eclipse.fx.simplycode.app/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
@@ -29,5 +34,6 @@
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
</natures>
</projectDescription>
diff --git a/demos/org.eclipse.fx.simplycode.app/Application.e4xmi b/demos/org.eclipse.fx.simplycode.app/Application.e4xmi
index 817c6a7a7..62e09ee57 100644
--- a/demos/org.eclipse.fx.simplycode.app/Application.e4xmi
+++ b/demos/org.eclipse.fx.simplycode.app/Application.e4xmi
@@ -7,6 +7,7 @@
<tags>editorContainer</tags>
</children>
</children>
+ <variables>activeInput</variables>
</children>
<rootContext xmi:id="_5jLXkDuxEeW_pv6K11JvGw" elementId="org.eclipse.ui.contexts.dialogAndWindow" name="In Dialog and Windows">
<children xmi:id="_5jLXkjuxEeW_pv6K11JvGw" elementId="org.eclipse.ui.contexts.window" name="In Windows"/>
diff --git a/demos/org.eclipse.fx.simplycode.app/bin/org/eclipse/fx/simplycode/app/parts/ProjectExplorer.class b/demos/org.eclipse.fx.simplycode.app/bin/org/eclipse/fx/simplycode/app/parts/ProjectExplorer.class
new file mode 100644
index 000000000..51e3fe520
--- /dev/null
+++ b/demos/org.eclipse.fx.simplycode.app/bin/org/eclipse/fx/simplycode/app/parts/ProjectExplorer.class
Binary files differ
diff --git a/demos/org.eclipse.fx.simplycode.app/bin/org/eclipse/fx/simplycode/app/themes/DefaultTheme.class b/demos/org.eclipse.fx.simplycode.app/bin/org/eclipse/fx/simplycode/app/themes/DefaultTheme.class
new file mode 100644
index 000000000..309855004
--- /dev/null
+++ b/demos/org.eclipse.fx.simplycode.app/bin/org/eclipse/fx/simplycode/app/themes/DefaultTheme.class
Binary files differ
diff --git a/demos/org.eclipse.fx.simplycode.app/css/default.css b/demos/org.eclipse.fx.simplycode.app/css/default.css
index c4ad87a47..109e3c32a 100644
--- a/demos/org.eclipse.fx.simplycode.app/css/default.css
+++ b/demos/org.eclipse.fx.simplycode.app/css/default.css
@@ -1 +1,19 @@
-/* JavaFX CSS - Main CSS-File */ \ No newline at end of file
+/* JavaFX CSS - Main CSS-File */
+.styled-text-area .source-segment {
+ -fx-font-family: Hack;
+ -fx-font-size: 12;
+}
+
+.styled-text-area .plain-source-segment {
+ -fx-font-family: Hack;
+ -fx-font-size: 12;
+}
+
+.styled-text-area .line-ruler-text {
+ -fx-font-family: Hack;
+ -fx-font-size: 12;
+}
+
+.styled-text-area .list-view {
+ -fx-fixed-cell-size: 16;
+} \ No newline at end of file
diff --git a/demos/org.eclipse.fx.simplycode.app/src/org/eclipse/fx/simplycode/app/parts/ProjectExplorer.java b/demos/org.eclipse.fx.simplycode.app/src/org/eclipse/fx/simplycode/app/parts/ProjectExplorer.java
index c26365ea9..a0a833f53 100644
--- a/demos/org.eclipse.fx.simplycode.app/src/org/eclipse/fx/simplycode/app/parts/ProjectExplorer.java
+++ b/demos/org.eclipse.fx.simplycode.app/src/org/eclipse/fx/simplycode/app/parts/ProjectExplorer.java
@@ -8,7 +8,7 @@ import javax.inject.Inject;
import org.eclipse.e4.ui.model.application.MApplication;
import org.eclipse.e4.ui.workbench.modeling.EModelService;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
-import org.eclipse.fx.code.editor.services.TextEditorOpener;
+import org.eclipse.fx.code.editor.services.EditorOpener;
import org.eclipse.fx.core.URI;
import org.eclipse.fx.ui.controls.filesystem.FileItem;
import org.eclipse.fx.ui.controls.filesystem.ResourceEvent;
@@ -29,7 +29,7 @@ public class ProjectExplorer {
EPartService partService;
@Inject
- TextEditorOpener textEditorOpener;
+ EditorOpener textEditorOpener;
@PostConstruct
public void init(BorderPane p, MApplication application, GraphicsLoader nodeProvider) {

Back to the top