diff options
| author | Alexander Kurtakov | 2019-10-28 19:39:59 +0000 |
|---|---|---|
| committer | Alexander Kurtakov | 2019-10-28 20:40:45 +0000 |
| commit | 20e5d9ffccec2ee86091188c407bf16b0dc5a103 (patch) | |
| tree | e6b9cce8e116e8acbe5d387da392e61a24a2bc5a | |
| parent | 4f9a3357dc1c614337f97cbc00c6686859e8c148 (diff) | |
| download | org.eclipse.linuxtools-20e5d9ffccec2ee86091188c407bf16b0dc5a103.tar.gz org.eclipse.linuxtools-20e5d9ffccec2ee86091188c407bf16b0dc5a103.tar.xz org.eclipse.linuxtools-20e5d9ffccec2ee86091188c407bf16b0dc5a103.zip | |
Bug 549667 - Contribute plugin for Dockerfile editing using
dockerfile-language-server-nodejs
Remove old editor.
Change-Id: I7bcf85ffc9ffeab9154222bd49738185557cfd97
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Reviewed-on: https://git.eclipse.org/r/151716
Tested-by: Linux Tools Bot <linuxtools-bot@eclipse.org>
52 files changed, 0 insertions, 1815 deletions
diff --git a/containers/org.eclipse.linuxtools.docker-feature/feature.xml b/containers/org.eclipse.linuxtools.docker-feature/feature.xml index 63c2823f30..7435bac83d 100644 --- a/containers/org.eclipse.linuxtools.docker-feature/feature.xml +++ b/containers/org.eclipse.linuxtools.docker-feature/feature.xml @@ -45,13 +45,6 @@ unpack="false"/> <plugin - id="org.eclipse.linuxtools.docker.editor" - download-size="0" - install-size="0" - version="0.0.0" - unpack="false"/> - - <plugin id="org.eclipse.linuxtools.docker.editor.ls" download-size="0" install-size="0" diff --git a/containers/org.eclipse.linuxtools.docker.editor/.classpath b/containers/org.eclipse.linuxtools.docker.editor/.classpath deleted file mode 100644 index eca7bdba8f..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?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/containers/org.eclipse.linuxtools.docker.editor/.gitignore b/containers/org.eclipse.linuxtools.docker.editor/.gitignore deleted file mode 100644 index ae3c172604..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/bin/ diff --git a/containers/org.eclipse.linuxtools.docker.editor/.project b/containers/org.eclipse.linuxtools.docker.editor/.project deleted file mode 100644 index 909f0809ec..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.linuxtools.docker.editor</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> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.jdt.core.prefs b/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 10035e5359..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,106 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled -org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore -org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull -org.eclipse.jdt.core.compiler.annotation.nonnull.secondary= -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault -org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary= -org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable -org.eclipse.jdt.core.compiler.annotation.nullable.secondary= -org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled -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.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -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.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -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=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning -org.eclipse.jdt.core.compiler.problem.nonnullTypeVariableFromLegacyInvocation=warning -org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error -org.eclipse.jdt.core.compiler.problem.nullReference=warning -org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error -org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.pessimisticNullAnalysisForFreeTypeVariables=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning -org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning -org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore -org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled -org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLabel=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.jdt.ui.prefs b/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index 1cbfac22d4..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,59 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=true -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=false -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.make_local_variable_final=true -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_type_arguments=false -sp_cleanup.remove_trailing_whitespaces=false -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=true -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_lambda=true -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true diff --git a/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.m2e.core.prefs b/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/containers/org.eclipse.linuxtools.docker.editor/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.editor/META-INF/MANIFEST.MF deleted file mode 100644 index 39c26364a8..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/META-INF/MANIFEST.MF +++ /dev/null @@ -1,17 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Dockerfile Editor -Bundle-SymbolicName: org.eclipse.linuxtools.docker.editor;singleton:=true -Bundle-Version: 1.0.0.qualifier -Bundle-Activator: org.eclipse.linuxtools.internal.docker.editor.Activator -Bundle-Vendor: Eclipse Linux Tools -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.ui.editors, - org.eclipse.jface.text -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Bundle-ActivationPolicy: lazy -Export-Package: org.eclipse.linuxtools.internal.docker.editor;x-friends:="org.eclipse.linuxtools.docker.ui" -Import-Package: org.eclipse.ui.ide -Automatic-Module-Name: org.eclipse.linuxtools.docker.editor diff --git a/containers/org.eclipse.linuxtools.docker.editor/about.html b/containers/org.eclipse.linuxtools.docker.editor/about.html deleted file mode 100644 index 164f781a8f..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/about.html +++ /dev/null @@ -1,36 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> -<title>About</title> -</head> -<body lang="EN-US"> - <h2>About This Content</h2> - - <p>November 30, 2017</p> - <h3>License</h3> - - <p> - The Eclipse Foundation makes available all content in this plug-in - ("Content"). Unless otherwise indicated below, the Content - is provided to you under the terms and conditions of the Eclipse - Public License Version 2.0 ("EPL"). A copy of the EPL is - available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>. - For purposes of the EPL, "Program" will mean the Content. - </p> - - <p> - If you did not receive this Content directly from the Eclipse - Foundation, the Content is being redistributed by another party - ("Redistributor") and different terms and conditions may - apply to your use of any object code in the Content. Check the - Redistributor's license that was provided with the Content. If no such - license exists, contact the Redistributor. Unless otherwise indicated - below, the terms and conditions of the EPL still apply to any source - code in the Content and such source code may be obtained at <a - href="http://www.eclipse.org/">http://www.eclipse.org</a>. - </p> - -</body> -</html>
\ No newline at end of file diff --git a/containers/org.eclipse.linuxtools.docker.editor/about.ini b/containers/org.eclipse.linuxtools.docker.editor/about.ini deleted file mode 100644 index 68dc433ff8..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/about.ini +++ /dev/null @@ -1,2 +0,0 @@ -featureImage=icons/about_docker.png -aboutText=Docker Editor: Eclipse Plugin for Editing Dockerfiles
\ No newline at end of file diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ADD.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ADD.html deleted file mode 100644 index 9285576a3b..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ADD.html +++ /dev/null @@ -1,9 +0,0 @@ -<p> -<b>ADD</b> copies files, directories or remote file URLs from a source to a destination. -</p> -<br/> -<p> -<pre> -ADD hom* /mydir/ # adds all files starting with "hom" -</pre> -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ARG.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ARG.html deleted file mode 100644 index ab7c668c62..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ARG.html +++ /dev/null @@ -1,13 +0,0 @@ -<p> -<b>ARG</b> defines a variable that users can pass at build-time to the builder with the docker build command using the --build-arg <varname>=<value> flag. If a user specifies a build argument that was not defined in the Dockerfile, the build outputs an error. -</p> -<br/> -<p> -<pre> -ARG user1 # Defines an build argument called 'user1' without any default values -ARG buildno # Defines an build argument called 'buildno' without any default values - -ARG user1=someuser # Defines and declares a default value for the build argument 'user1' -ARG buildno=123 # Defines and declares a default value for the build argument 'buildno' -</pre> -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/CMD.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/CMD.html deleted file mode 100644 index 35ba857967..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/CMD.html +++ /dev/null @@ -1,23 +0,0 @@ -<p> -<b>CMD</b> provides defaults for an executing container -</p> -<br/> -<p> -There are three ways to specify a CMD: the (preferred) exec form -<br/> -<pre> -CMD ["executable", "param1", "param2"] -</pre> -<br/> -as default parameters to ENTRYPOINT: -<br/> -<pre> -CMD ["param1","param2"] -</pre> -<br/> -and in shell form -<br/> -<pre> -CMD command param1 param2 -</pre> -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/COPY.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/COPY.html deleted file mode 100644 index fd4890c2da..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/COPY.html +++ /dev/null @@ -1,9 +0,0 @@ -<p> -<b>COPY</b> copies new files or directories from source and adds them to the filesystem of the container at the destination path -</p> -<br/> -<p> -<pre> -COPY hom* /mydir/ # adds all files starting with "hom" -</pre> -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ENTRYPOINT.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ENTRYPOINT.html deleted file mode 100644 index 8e17e7458e..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ENTRYPOINT.html +++ /dev/null @@ -1,17 +0,0 @@ -<p> -<b>ENTRYPOINT</b> configures a container that will be run as an executable. -</p> -<br/> -<p> -There are two ways to specify an ENTRYPOINT: the (preferred) exec form -<br/> -<pre> -ENTRYPOINT ["executable", "param1", "param2"] -</pre> -<br/> -and the shell form: -<br/> -<pre> -ENTRYPOINT command param1 param2 -</pre> -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ENV.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ENV.html deleted file mode 100644 index 7aff5fcbbe..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ENV.html +++ /dev/null @@ -1,13 +0,0 @@ -<p> -<b>ENV</b> allows to declare environment variables. -</p> -<br/> -<p> -<pre> -ENV CATALINA_HOME /usr/local/tomcat -</pre> -<br/> -<pre> -ENV LC_ALL en_US.UTF-8 -</pre> -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/EXPOSE.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/EXPOSE.html deleted file mode 100644 index 443f262cda..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/EXPOSE.html +++ /dev/null @@ -1,7 +0,0 @@ -<p> -<b>EXPOSE</b> specifies network ports on which the container will listen at runtime. -</p> -<br/> -<p> -EXPOSE 8080 -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/FROM.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/FROM.html deleted file mode 100644 index cff119cba8..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/FROM.html +++ /dev/null @@ -1,20 +0,0 @@ -<p> -<b>FROM</b> sets the base image starting from which the image is built. -</p> -<br/> -<p> -<pre> -FROM image -</pre> -<br/> -<pre> -FROM image:tag -<pre> -<br/> -FROM image@digest -</pre> -</p> -<br/> -<p> -<b>FROM</b> must be the first non-comment instruction in the Dockerfile -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/HEALTHCHECK.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/HEALTHCHECK.html deleted file mode 100644 index 1efe13f2cc..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/HEALTHCHECK.html +++ /dev/null @@ -1,7 +0,0 @@ -<p> -Specify the <b>HEALTHCHECK</b> of the Docker image. -</p> -<br/> -<p> -HEALTHCHECK --timeout=3s CMD curl -f http://localhost/ || exit 1 -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/LABEL.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/LABEL.html deleted file mode 100644 index 9055969bf7..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/LABEL.html +++ /dev/null @@ -1,21 +0,0 @@ -<p> -<b>LABEL</b> adds meta-data to an image using one or more key-value pairs. -</p> -<br/> -<p> -<pre> -LABEL Description="Docker Image for running the R Service Bus" Vendor="Open Analytics NV" Version="6.2" -</pre> -<br/> -<pre> -LABEL com.example.label-without-value -LABEL com.example.label-with-value="foo" -LABEL version="1.0" -LABEL description="This text illustrates \ -that label-values can span multiple lines." -</pre> -</p> -<br/> -<p> -N.B. Image labels can be viewed using the <pre>docker inspect </pre> command. -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/MAINTAINER.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/MAINTAINER.html deleted file mode 100644 index d463e6eaed..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/MAINTAINER.html +++ /dev/null @@ -1,7 +0,0 @@ -<p> -Specify the <b>MAINTAINER</b> of the Docker image. -</p> -<br/> -<p> -MAINTAINER "Tobias Verbeke" -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ONBUILD.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ONBUILD.html deleted file mode 100644 index 244566d95c..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/ONBUILD.html +++ /dev/null @@ -1,10 +0,0 @@ -<p> -<b>ONBUILD</b> specifies a 'trigger' instruction executed when the image is used as the base for another build. -</p> -<br/> -<p> -<pre> -ONBUILD ADD . /app/src -ONBUILD RUN /usr/local/bin/python-build --dir /app/src -</pre> -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/RUN.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/RUN.html deleted file mode 100644 index 02718342c5..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/RUN.html +++ /dev/null @@ -1,17 +0,0 @@ -<p> -<b>RUN</b> executes any commands in a new layer on top of the current image and commits the results -</p> -<br/> -<p> -There are two ways to specify a RUN: the exec form -<br/> -<pre> -RUN ["executable", "param1", "param2"] -</pre> -<br/> -and the shell form: -<br/> -<pre> -RUN command param1 param2 -</pre> -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/SHELL.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/SHELL.html deleted file mode 100644 index eb4eab17e3..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/SHELL.html +++ /dev/null @@ -1,9 +0,0 @@ -<p> -<b>SHELL</b> allows overriding the default shell used for the shell form of commands. The JSON format is required: ["executable", "parameters"]. On Linux, the default is: ["/bin/sh", "-c"] whereas on Windows it is ["cmd", "/S", "/C"]. -</p> -<br/> -<p> -<pre> -SHELL ["powershell", "-command"] -</pre> -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/USER.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/USER.html deleted file mode 100644 index 05a240906b..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/USER.html +++ /dev/null @@ -1,9 +0,0 @@ -<p> -<b>USER</b> sets the user name or UID used when running the image. -</p> -<br/> -<p> -<pre> -USER jenkins -</pre> -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/VOLUME.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/VOLUME.html deleted file mode 100644 index fcffb119be..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/VOLUME.html +++ /dev/null @@ -1,11 +0,0 @@ -<p> -<b>VOLUME</b> creates a mount point with the specified name -</p> -<br/> -<p> -<pre> -VOLUME ["/data"] # specified as a JSON array -VOLUME /var/log -VOLUME /var/log /var/db -</pre> -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/WORKDIR.html b/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/WORKDIR.html deleted file mode 100644 index 724c58c1b0..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/additional-info/WORKDIR.html +++ /dev/null @@ -1,9 +0,0 @@ -<p> -<b>WORKDIR</b> sets the working directory for all WORKDIR instruction sets the working directory for any RUN, CMD, ENTRYPOINT, COPY and ADD instructions that follow -</p> -<br/> -<p> -<pre> -WORKDIR /opt/architect -</pre> -</p> diff --git a/containers/org.eclipse.linuxtools.docker.editor/assets/instructions.txt b/containers/org.eclipse.linuxtools.docker.editor/assets/instructions.txt deleted file mode 100644 index 8c0ffccc8f..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/assets/instructions.txt +++ /dev/null @@ -1,17 +0,0 @@ -ADD -ARG -CMD -COPY -ENTRYPOINT -ENV -EXPOSE -FROM -HEALTHCHECK -LABEL -MAINTAINER -ONBUILD -RUN -SHELL -USER -VOLUME -WORKDIR diff --git a/containers/org.eclipse.linuxtools.docker.editor/build.properties b/containers/org.eclipse.linuxtools.docker.editor/build.properties deleted file mode 100644 index f4328738d0..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/build.properties +++ /dev/null @@ -1,9 +0,0 @@ -source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - plugin.xml,\ - about.html,\ - icons/,\ - assets/,\ - about.ini diff --git a/containers/org.eclipse.linuxtools.docker.editor/icons/about_docker.png b/containers/org.eclipse.linuxtools.docker.editor/icons/about_docker.png Binary files differdeleted file mode 100644 index abf2ddd4b5..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/icons/about_docker.png +++ /dev/null diff --git a/containers/org.eclipse.linuxtools.docker.editor/icons/dockerfile.png b/containers/org.eclipse.linuxtools.docker.editor/icons/dockerfile.png Binary files differdeleted file mode 100644 index da01d32688..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/icons/dockerfile.png +++ /dev/null diff --git a/containers/org.eclipse.linuxtools.docker.editor/plugin.xml b/containers/org.eclipse.linuxtools.docker.editor/plugin.xml deleted file mode 100644 index db215f032e..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/plugin.xml +++ /dev/null @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.4"?> -<plugin> - <extension - point="org.eclipse.core.contenttype.contentTypes"> - <content-type - base-type="org.eclipse.core.runtime.text" - file-extensions="dockerfile" - file-names="Dockerfile" - id="org.eclipse.linuxtools.dockerfile.content-type" - name="Dockerfile" - priority="high"> - </content-type> - </extension> - <extension - point="org.eclipse.ui.editors.documentProviders"> - <provider - class="org.eclipse.linuxtools.internal.docker.editor.DockerDocumentProvider" - extensions="dockerfile" - id="org.eclipse.linuxtools.docker.editor.documentProvider"> - </provider> - </extension> - <extension - point="org.eclipse.ui.genericeditor.presentationReconcilers"> - <presentationReconciler - class="org.eclipse.linuxtools.internal.docker.editor.DockerPresentationReconciler" - contentType="org.eclipse.linuxtools.dockerfile.content-type"> - </presentationReconciler> - </extension> - <extension point="org.eclipse.ui.genericeditor.contentAssistProcessors"> - <contentAssistProcessor - class="org.eclipse.linuxtools.internal.docker.editor.assist.CompletionProcessor" - contentType="org.eclipse.linuxtools.dockerfile.content-type"> - </contentAssistProcessor> - </extension> - <extension point="org.eclipse.ui.genericeditor.hoverProviders"> - <hoverProvider - class="org.eclipse.linuxtools.internal.docker.editor.DockerHover" - contentType="org.eclipse.linuxtools.dockerfile.content-type"> - </hoverProvider> - </extension> - <extension - point="org.eclipse.ui.editors"> - <editor - class="org.eclipse.linuxtools.internal.docker.editor.DockerEditor" - contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor" - default="false" - icon="icons/dockerfile.png" - id="org.eclipse.linuxtools.DockerEditor" - name="Dockerfile Editor"> - <contentTypeBinding - contentTypeId="org.eclipse.linuxtools.dockerfile.content-type"> - </contentTypeBinding> - </editor> - </extension> - <extension - point="org.eclipse.ui.themes"> - <themeElementCategory - id="org.eclipse.linuxtools.docker.editor.presentation" - label="Dockerfile"> - </themeElementCategory> - <colorDefinition - categoryId="org.eclipse.linuxtools.docker.editor.presentation" - id="org.eclipse.linuxtools.docker.editor.color.instruction" - label="Instruction" - value="0,128,0"> - </colorDefinition> - <colorDefinition - categoryId="org.eclipse.linuxtools.docker.editor.presentation" - id="org.eclipse.linuxtools.docker.editor.color.string" - label="String" - value="0,0,255"> - </colorDefinition> - <colorDefinition - categoryId="org.eclipse.linuxtools.docker.editor.presentation" - id="org.eclipse.linuxtools.docker.editor.color.comment" - label="Comment" - value="128,128,128"> - </colorDefinition> - <colorDefinition - categoryId="org.eclipse.linuxtools.docker.editor.presentation" - id="org.eclipse.linuxtools.docker.editor.color.variable" - label="Variable" - value="255,0,0"> - </colorDefinition> - </extension> - -</plugin> diff --git a/containers/org.eclipse.linuxtools.docker.editor/pom.xml b/containers/org.eclipse.linuxtools.docker.editor/pom.xml deleted file mode 100644 index 75da3ed063..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/pom.xml +++ /dev/null @@ -1,13 +0,0 @@ -<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> - <parent> - <groupId>org.eclipse.linuxtools</groupId> - <artifactId>org.eclipse.linuxtools.docker</artifactId> - <version>4.5.0-SNAPSHOT</version> - </parent> - <artifactId>org.eclipse.linuxtools.docker.editor</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> - -</project> diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/Activator.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/Activator.java deleted file mode 100644 index 41f7038c5b..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/Activator.java +++ /dev/null @@ -1,51 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2018 Open Analytics NV and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor; - -import org.eclipse.core.runtime.Status; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.linuxtools.docker.editor"; //$NON-NLS-1$ - - // The shared instance - private static Activator plugin; - - @Override - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - @Override - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static Activator getDefault() { - return plugin; - } - - public static void log(int severity, String message, Throwable cause) { - getDefault().getLog().log(new Status(severity, PLUGIN_ID, message, cause)); - } -} diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerConfiguration.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerConfiguration.java deleted file mode 100644 index ff5e1e9cca..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerConfiguration.java +++ /dev/null @@ -1,65 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2018 Open Analytics NV and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor; - -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextHover; -import org.eclipse.jface.text.contentassist.ContentAssistant; -import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.jface.text.contentassist.IContentAssistant; -import org.eclipse.jface.text.presentation.IPresentationReconciler; -import org.eclipse.jface.text.reconciler.IReconciler; -import org.eclipse.jface.text.reconciler.IReconcilingStrategy; -import org.eclipse.jface.text.reconciler.Reconciler; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.linuxtools.internal.docker.editor.assist.CompletionProcessor; -import org.eclipse.linuxtools.internal.docker.editor.syntax.SyntaxReconcilingStrategy; -import org.eclipse.ui.editors.text.TextSourceViewerConfiguration; - -public class DockerConfiguration extends TextSourceViewerConfiguration { - - private DockerEditor editor; - private DockerHover hover; - - public DockerConfiguration(DockerEditor editor) { - this.editor = editor; - } - - @Override - public IPresentationReconciler getPresentationReconciler(ISourceViewer sourceViewer) { - return new DockerPresentationReconciler(); - } - - @Override - public IReconciler getReconciler(ISourceViewer sourceViewer) { - Reconciler reconciler = new Reconciler(); - IReconcilingStrategy strategy = new SyntaxReconcilingStrategy(editor); - reconciler.setReconcilingStrategy(strategy, IDocument.DEFAULT_CONTENT_TYPE); - return reconciler; - } - - @Override - public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) { - ContentAssistant ca = new ContentAssistant(); - IContentAssistProcessor cap = new CompletionProcessor(); - ca.setContentAssistProcessor(cap, IDocument.DEFAULT_CONTENT_TYPE); - ca.setInformationControlCreator(getInformationControlCreator(sourceViewer)); - return ca; - } - - @Override - public ITextHover getTextHover(ISourceViewer sourceViewer, String contentType) { - if (hover == null) { - hover = new DockerHover(); - } - return hover; - } - -} diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerDocumentProvider.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerDocumentProvider.java deleted file mode 100644 index 2ed4bef9f6..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerDocumentProvider.java +++ /dev/null @@ -1,210 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2018 Open Analytics NV and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor; - -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.ByteBuffer; -import java.nio.CharBuffer; -import java.nio.charset.CharacterCodingException; -import java.nio.charset.Charset; -import java.nio.charset.CharsetEncoder; -import java.nio.charset.CodingErrorAction; -import java.nio.charset.IllegalCharsetNameException; -import java.nio.charset.UnmappableCharacterException; -import java.nio.charset.UnsupportedCharsetException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; - -import org.eclipse.core.runtime.Assert; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IDocumentPartitioner; -import org.eclipse.jface.text.rules.FastPartitioner; -import org.eclipse.linuxtools.internal.docker.editor.scanner.DockerPartitionScanner; -import org.eclipse.osgi.util.NLS; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.editors.text.EditorsUI; -import org.eclipse.ui.editors.text.FileDocumentProvider; -import org.eclipse.ui.ide.FileStoreEditorInput; -import org.eclipse.ui.texteditor.ResourceMarkerAnnotationModel; - -public class DockerDocumentProvider extends FileDocumentProvider { - - @Override - protected IDocument createDocument(Object element) throws CoreException { - IDocument document = super.createDocument(element); - if (document != null) { - DockerPartitionScanner scanner = new DockerPartitionScanner(); - IDocumentPartitioner partitioner = new FastPartitioner(scanner, - DockerPartitionScanner.ALLOWED_CONTENT_TYPES); - partitioner.connect(document); - document.setDocumentPartitioner(partitioner); - } - return document; - } - - @Override - public String getEncoding(Object element) { - return Charset.defaultCharset().name(); - } - - @Override - public boolean isReadOnly(Object element) { - if (element instanceof FileStoreEditorInput) { - String path = ((FileStoreEditorInput) element).getURI().getPath(); - return !new File(path).canWrite(); - } else { - return super.isReadOnly(element); - } - } - - @Override - public boolean isModifiable(Object element) { - if (element instanceof FileStoreEditorInput) { - String path = ((FileStoreEditorInput) element).getURI().getPath(); - return new File(path).canWrite(); - } else { - return super.isModifiable(element); - } - } - - @Override - protected boolean setDocumentContent(IDocument document, IEditorInput editorInput, String encoding) - throws CoreException { - if (editorInput instanceof FileStoreEditorInput) { - String path = ((FileStoreEditorInput) editorInput).getURI().getPath(); - InputStream in; - try { - in = new FileInputStream(path); - } catch (FileNotFoundException e) { - return false; - } - super.setDocumentContent(document, in, encoding); - return true; - } else { - return super.setDocumentContent(document, editorInput, encoding); - } - } - - @Override - protected void doSaveDocument(IProgressMonitor monitor, Object element, IDocument document, boolean overwrite) - throws CoreException { - if (element instanceof FileStoreEditorInput) { - - String encoding = null; - - ElementInfo info = getElementInfo(element); - Path filePath = Paths.get(((FileStoreEditorInput) element).getURI()); - - encoding = getEncoding(element); - - Charset charset; - try { - charset = Charset.forName(encoding); - } catch (UnsupportedCharsetException ex) { - String message = NLS.bind(Messages.DockerDocumentProvider_encoding_not_supported, encoding); - IStatus s = new Status(IStatus.ERROR, EditorsUI.PLUGIN_ID, IStatus.OK, message, ex); - throw new CoreException(s); - } catch (IllegalCharsetNameException ex) { - String message = NLS.bind(Messages.DockerDocumentProvider_encoding_not_legal, encoding); - IStatus s = new Status(IStatus.ERROR, EditorsUI.PLUGIN_ID, IStatus.OK, message, ex); - throw new CoreException(s); - } - - CharsetEncoder encoder = charset.newEncoder(); - encoder.onMalformedInput(CodingErrorAction.REPLACE); - encoder.onUnmappableCharacter(CodingErrorAction.REPORT); - - InputStream stream; - - try { - byte[] bytes; - ByteBuffer byteBuffer = encoder.encode(CharBuffer.wrap(document.get())); - if (byteBuffer.hasArray()) - bytes = byteBuffer.array(); - else { - bytes = new byte[byteBuffer.limit()]; - byteBuffer.get(bytes); - } - stream = new ByteArrayInputStream(bytes, 0, byteBuffer.limit()); - } catch (CharacterCodingException ex) { - Assert.isTrue(ex instanceof UnmappableCharacterException); - String message = NLS.bind(Messages.DockerDocumentProvider_cannot_be_mapped - + Messages.DockerDocumentProvider_chars_not_supported, encoding); - IStatus s = new Status(IStatus.ERROR, EditorsUI.PLUGIN_ID, EditorsUI.CHARSET_MAPPING_FAILED, message, - null); - throw new CoreException(s); - } - - if (Files.exists(filePath)) { - // inform about the upcoming content change - fireElementStateChanging(element); - try (FileWriter fw = new FileWriter(filePath.toFile()); - InputStreamReader istream = new InputStreamReader(stream)) { - char[] bb = new char[1024]; - int nRead = istream.read(bb); - while (nRead > 0) { - fw.write(bb, 0, nRead); - nRead = istream.read(bb); - } - } catch (RuntimeException | IOException x) { - // inform about failure - fireElementStateChangeFailed(element); - throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, x.getMessage())); - } - - // If here, the editor state will be flipped to "not dirty". - // Thus, the state changing flag will be reset. - - if (info != null) { - - ResourceMarkerAnnotationModel model = (ResourceMarkerAnnotationModel) info.fModel; - if (model != null) - model.updateMarkers(info.fDocument); - } - - } else { - try { - Files.createFile(filePath); - try (FileWriter fw = new FileWriter(filePath.toFile()); - InputStreamReader istream = new InputStreamReader(stream)) { - char[] bb = new char[1024]; - int nRead = istream.read(bb); - while (nRead > 0) { - fw.write(bb, 0, nRead); - nRead = istream.read(bb); - } - } catch (IOException x) { - throw x; - } - } catch (IOException e) { - throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, e.getMessage())); - } finally { - monitor.done(); - } - } - - } else { - super.doSaveDocument(monitor, element, document, overwrite); - } - } - -}
\ No newline at end of file diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerEditor.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerEditor.java deleted file mode 100644 index fff9fab08b..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerEditor.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2018 Open Analytics NV and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.linuxtools.internal.docker.editor.syntax.SyntaxProblemReporter; -import org.eclipse.ui.editors.text.TextEditor; - -public class DockerEditor extends TextEditor { - - public DockerEditor() { - super(); - setSourceViewerConfiguration(new DockerConfiguration(this)); - setDocumentProvider(new DockerDocumentProvider()); - } - - @Override - public void doSave(IProgressMonitor progressMonitor) { - try { - IResource resource = getEditorInput().getAdapter(IResource.class); - IDocument document = getDocumentProvider().getDocument(getEditorInput()); - new SyntaxProblemReporter().checkAndApply(document, 0, document.getLength(), resource); - } catch (CoreException | BadLocationException e) { - Activator.log(IStatus.ERROR, "Failed to perform syntax check", e); - } - super.doSave(progressMonitor); - } -} diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerHover.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerHover.java deleted file mode 100644 index 96aa000b99..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerHover.java +++ /dev/null @@ -1,101 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017, 2018 Red Hat Inc and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Red Hat - initial API and implmentation. - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor; - -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.DefaultInformationControl; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IInformationControlCreator; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextHover; -import org.eclipse.jface.text.ITextHoverExtension; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.Region; -import org.eclipse.linuxtools.internal.docker.editor.util.AssetLoader; - -public class DockerHover implements ITextHover, ITextHoverExtension { - - private AssetLoader loader; - - public DockerHover() { - loader = new AssetLoader(); - } - - @Override - public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) { - String varName = null; - try { - varName = textViewer.getDocument().get(hoverRegion.getOffset(), hoverRegion.getLength()); - } catch (BadLocationException e) { - return null; - } - - return loader.getInfo(varName); - } - - @Override - public IRegion getHoverRegion(ITextViewer textViewer, int offset) { - return findWord(textViewer.getDocument(), offset); - } - - @Override - public IInformationControlCreator getHoverControlCreator() { - return parent -> new DefaultInformationControl(parent, false); - } - - private IRegion findWord(IDocument document, int offset) { - int start = -2; - int end = -1; - - try { - - int pos = offset; - char c; - - while (pos >= 0) { - c = document.getChar(pos); - if (!Character.isUnicodeIdentifierPart(c)) - break; - --pos; - } - - start = pos; - - pos = offset; - int length = document.getLength(); - - while (pos < length) { - c = document.getChar(pos); - if (!Character.isUnicodeIdentifierPart(c)) - break; - ++pos; - } - - end = pos; - - } catch (BadLocationException x) { - } - - if (start >= -1 && end > -1) { - if (start == offset && end == offset) - return new Region(offset, 0); - else if (start == offset) - return new Region(start, end - start); - else - return new Region(start + 1, end - start - 1); - } - - return null; - } - -} diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerPresentationReconciler.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerPresentationReconciler.java deleted file mode 100644 index 001fefb3ee..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/DockerPresentationReconciler.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2017, 2018 Red Hat Inc and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Red Hat - initial API and implmentation. - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor; - -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.presentation.PresentationReconciler; -import org.eclipse.jface.text.rules.DefaultDamagerRepairer; -import org.eclipse.linuxtools.internal.docker.editor.scanner.DockerCommentScanner; -import org.eclipse.linuxtools.internal.docker.editor.scanner.DockerInstructionScanner; -import org.eclipse.linuxtools.internal.docker.editor.scanner.DockerPartitionScanner; - -public class DockerPresentationReconciler extends PresentationReconciler { - - public DockerPresentationReconciler() { - super(); - DefaultDamagerRepairer dr = new DefaultDamagerRepairer(new DockerCommentScanner()); - this.setDamager(dr, DockerPartitionScanner.TYPE_COMMENT); - this.setRepairer(dr, DockerPartitionScanner.TYPE_COMMENT); - - dr = new DefaultDamagerRepairer(new DockerInstructionScanner()); - this.setDamager(dr, IDocument.DEFAULT_CONTENT_TYPE); - this.setRepairer(dr, IDocument.DEFAULT_CONTENT_TYPE); - } - -} diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/Messages.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/Messages.java deleted file mode 100644 index 57eb665249..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/Messages.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2016, 2018 Red Hat. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - * - * Contributors: - * Red Hat - Initial Contribution - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.docker.editor.messages"; //$NON-NLS-1$ - public static String DockerDocumentProvider_cannot_be_mapped; - public static String DockerDocumentProvider_chars_not_supported; - public static String DockerDocumentProvider_encoding_not_legal; - public static String DockerDocumentProvider_encoding_not_supported; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - } -} diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/assist/CompletionProcessor.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/assist/CompletionProcessor.java deleted file mode 100644 index df9ac06a21..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/assist/CompletionProcessor.java +++ /dev/null @@ -1,102 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2018 Open Analytics NV and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor.assist; - -import java.util.ArrayList; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.eclipse.jface.text.contentassist.IContextInformation; -import org.eclipse.jface.text.contentassist.IContextInformationValidator; -import org.eclipse.linuxtools.internal.docker.editor.Activator; -import org.eclipse.linuxtools.internal.docker.editor.scanner.InstructionWordRule; -import org.eclipse.linuxtools.internal.docker.editor.util.AssetLoader; - -public class CompletionProcessor implements IContentAssistProcessor { - - private static final ICompletionProposal[] NO_COMPLETIONS = {}; - private static final IContextInformation[] NO_CONTEXTS = {}; - private static final char[] PROPOSAL_ACTIVATION_CHARS = {}; - private static final char[] INFO_ACTIVATION_CHARS = {}; - private AssetLoader assetLoader; - - public CompletionProcessor() { - assetLoader = new AssetLoader(); - } - - @Override - public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) { - try { - IDocument document = viewer.getDocument(); - ArrayList<ICompletionProposal> result = new ArrayList<>(); - - int lineNr = document.getLineOfOffset(offset); - int lineOffset = document.getLineOffset(lineNr); - - boolean isNewLine = (offset == 0) || (document.getChar(offset - 1) == '\n'); - if (isNewLine) { - for (String instr : InstructionWordRule.INSTRUCTIONS) - result.add(new CompletionProposal(instr, lineOffset, 0, assetLoader.getInfo(instr))); - } - - boolean isFirstWord = true; - for (int i = lineOffset; i < offset; i++) { - if (Character.isWhitespace(document.getChar(i))) - isFirstWord = false; - } - if (isFirstWord) { - String prefix = ""; - for (int i = lineOffset; i < offset; i++) - prefix += document.getChar(i); - for (String instr : InstructionWordRule.INSTRUCTIONS) { - if (instr.toLowerCase().startsWith(prefix.toLowerCase())) - result.add( - new CompletionProposal(instr, lineOffset, prefix.length(), assetLoader.getInfo(instr))); - } - } - - return result.toArray(new ICompletionProposal[result.size()]); - } catch (Exception e) { - Activator.getDefault().getLog() - .log(new Status(IStatus.WARNING, Activator.PLUGIN_ID, "Failed to compute completion proposals", e)); - return NO_COMPLETIONS; - } - } - - @Override - public IContextInformation[] computeContextInformation(ITextViewer viewer, int offset) { - return NO_CONTEXTS; - } - - @Override - public char[] getCompletionProposalAutoActivationCharacters() { - return PROPOSAL_ACTIVATION_CHARS; - } - - @Override - public char[] getContextInformationAutoActivationCharacters() { - return INFO_ACTIVATION_CHARS; - } - - @Override - public String getErrorMessage() { - return ""; - } - - @Override - public IContextInformationValidator getContextInformationValidator() { - return null; - } - -}
\ No newline at end of file diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/assist/CompletionProposal.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/assist/CompletionProposal.java deleted file mode 100644 index 511e4a783e..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/assist/CompletionProposal.java +++ /dev/null @@ -1,91 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2018 Open Analytics NV and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor.assist; - -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.DefaultInformationControl; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IInformationControlCreator; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.ICompletionProposalExtension3; -import org.eclipse.jface.text.contentassist.IContextInformation; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Point; - -/** - * Based on {@link org.eclipse.jface.text.contentassist.CompletionProposal} with - * added functionality for showing additional information formatted as HTML. - */ -public class CompletionProposal implements ICompletionProposal, ICompletionProposalExtension3 { - - private String fReplacementString; - private int fReplacementOffset; - private int fReplacementLength; - - private String fAdditionalProposalInfo; - - public CompletionProposal(String replacementString, int replacementOffset, int replacementLength, - String additionalProposalInfo) { - this.fReplacementString = replacementString; - this.fReplacementOffset = replacementOffset; - this.fReplacementLength = replacementLength; - this.fAdditionalProposalInfo = additionalProposalInfo; - } - - @Override - public void apply(IDocument document) { - try { - document.replace(fReplacementOffset, fReplacementLength, fReplacementString); - } catch (BadLocationException x) { - // ignore - } - } - - @Override - public Point getSelection(IDocument document) { - return new Point(fReplacementOffset + fReplacementString.length(), 0); - } - - @Override - public String getDisplayString() { - return fReplacementString; - } - - @Override - public String getAdditionalProposalInfo() { - return fAdditionalProposalInfo; - } - - @Override - public IInformationControlCreator getInformationControlCreator() { - return shell -> new DefaultInformationControl(shell, true); - } - - @Override - public IContextInformation getContextInformation() { - return null; - } - - @Override - public Image getImage() { - return null; - } - - @Override - public CharSequence getPrefixCompletionText(IDocument document, int completionOffset) { - return null; - } - - @Override - public int getPrefixCompletionStart(IDocument document, int completionOffset) { - return 0; - } - -}
\ No newline at end of file diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/messages.properties b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/messages.properties deleted file mode 100644 index e6ad7ef8ed..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/messages.properties +++ /dev/null @@ -1,4 +0,0 @@ -DockerDocumentProvider_cannot_be_mapped=Some characters cannot be mapped using {0} character encoding. -DockerDocumentProvider_chars_not_supported=Either change the encoding or remove the characters which are not supported by the {0} character encoding. -DockerDocumentProvider_encoding_not_legal=Character encoding {0} is not a legal character encoding. -DockerDocumentProvider_encoding_not_supported=Character encoding {0} is not supported by this platform. diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerCommentScanner.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerCommentScanner.java deleted file mode 100644 index fc60be5422..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerCommentScanner.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2018 Open Analytics NV and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor.scanner; - -import org.eclipse.jface.text.TextAttribute; -import org.eclipse.jface.text.rules.EndOfLineRule; -import org.eclipse.jface.text.rules.ICharacterScanner; -import org.eclipse.jface.text.rules.IRule; -import org.eclipse.jface.text.rules.IToken; -import org.eclipse.jface.text.rules.RuleBasedScanner; -import org.eclipse.jface.text.rules.Token; -import org.eclipse.linuxtools.internal.docker.editor.syntax.SyntaxColors; - -public class DockerCommentScanner extends RuleBasedScanner { - - public static final String COMMENT_SEQUENCE = "#"; - - public DockerCommentScanner() { - IToken token = new Token(new TextAttribute(SyntaxColors.getCommentColor())); - - IRule[] rules = new IRule[1]; - rules[0] = new EndOfLineRule(COMMENT_SEQUENCE, token) { - @Override - public IToken evaluate(ICharacterScanner scanner, boolean resume) { - if (getColumn() > 0) - return Token.UNDEFINED; - return super.evaluate(scanner, resume); - } - }; - - setRules(rules); - } -} diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerInstructionScanner.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerInstructionScanner.java deleted file mode 100644 index 2e6cd5493c..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerInstructionScanner.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2018 Open Analytics NV and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor.scanner; - -import org.eclipse.jface.text.TextAttribute; -import org.eclipse.jface.text.rules.EndOfLineRule; -import org.eclipse.jface.text.rules.ICharacterScanner; -import org.eclipse.jface.text.rules.IRule; -import org.eclipse.jface.text.rules.IToken; -import org.eclipse.jface.text.rules.RuleBasedScanner; -import org.eclipse.jface.text.rules.SingleLineRule; -import org.eclipse.jface.text.rules.Token; -import org.eclipse.linuxtools.internal.docker.editor.syntax.SyntaxColors; - -public class DockerInstructionScanner extends RuleBasedScanner { - - public DockerInstructionScanner() { - IToken instructionToken = new Token(new TextAttribute(SyntaxColors.getInstructionColor())); - IToken stringToken = new Token(new TextAttribute(SyntaxColors.getStringColor())); - IToken varToken = new Token(new TextAttribute(SyntaxColors.getVariableColor())); - IToken commentToken = new Token(new TextAttribute(SyntaxColors.getCommentColor())); - - IRule[] rules = new IRule[5]; - rules[0] = new InstructionWordRule(instructionToken); - rules[1] = new SingleLineRule("\"", "\"", stringToken, '\\'); - rules[2] = new SingleLineRule("\'", "\'", stringToken, '\\'); - rules[3] = new SingleLineRule("${", "}", varToken, '\\'); - rules[4] = new EndOfLineRule("#", commentToken) { - @Override - public IToken evaluate(ICharacterScanner scanner, boolean resume) { - if (getColumn() > 0) - return Token.UNDEFINED; - return super.evaluate(scanner, resume); - } - }; - - setRules(rules); - } -} diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerPartitionScanner.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerPartitionScanner.java deleted file mode 100644 index ff403e7945..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/DockerPartitionScanner.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2018 Open Analytics NV and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor.scanner; - -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.rules.EndOfLineRule; -import org.eclipse.jface.text.rules.IPredicateRule; -import org.eclipse.jface.text.rules.IToken; -import org.eclipse.jface.text.rules.RuleBasedPartitionScanner; -import org.eclipse.jface.text.rules.Token; - -/** - * This scanner partitions the document in two things: - * <ul> - * <li>Comments, of type TYPE_COMMENT</li> - * <li>Everything else, of type {@link IDocument#DEFAULT_CONTENT_TYPE}</li> - * </ul> - */ -public class DockerPartitionScanner extends RuleBasedPartitionScanner { - - public final static String TYPE_COMMENT = "__docker_comment"; - - public final static String[] ALLOWED_CONTENT_TYPES = { TYPE_COMMENT }; - - public DockerPartitionScanner() { - IToken commentToken = new Token(TYPE_COMMENT); - IPredicateRule[] rules = new IPredicateRule[1]; - rules[0] = new EndOfLineRule(DockerCommentScanner.COMMENT_SEQUENCE, commentToken); - setPredicateRules(rules); - } - -} diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/InstructionWordRule.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/InstructionWordRule.java deleted file mode 100644 index 44f1c36bc2..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/scanner/InstructionWordRule.java +++ /dev/null @@ -1,62 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2018 Open Analytics NV and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor.scanner; - -import java.io.IOException; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.text.rules.IToken; -import org.eclipse.jface.text.rules.IWordDetector; -import org.eclipse.jface.text.rules.Token; -import org.eclipse.jface.text.rules.WordRule; -import org.eclipse.linuxtools.internal.docker.editor.Activator; -import org.eclipse.linuxtools.internal.docker.editor.util.AssetLoader; - -public class InstructionWordRule extends WordRule { - - public static final String[] INSTRUCTIONS; - - private static final String INSTRUCTION_FILE_PATH = "assets/instructions.txt"; - - // Load instructions from the text file. - static { - String[] loadedInstructions = new String[0]; - try { - String contentsString = AssetLoader.loadAsset(INSTRUCTION_FILE_PATH); - String lineSeparator = (contentsString.contains("\r\n")) ? "\r\n" : "\n"; - loadedInstructions = contentsString.split(lineSeparator); - } catch (IOException e) { - Activator.log(IStatus.WARNING, - "No content assist available: error while reading instruction file: " + INSTRUCTION_FILE_PATH, e); - } - INSTRUCTIONS = loadedInstructions; - } - - public InstructionWordRule(IToken instructionToken) { - super(new InstructionWordDetector(), Token.UNDEFINED, true); - setColumnConstraint(0); - for (String instruction : INSTRUCTIONS) - addWord(instruction, instructionToken); - } - - private static class InstructionWordDetector implements IWordDetector { - - @Override - public boolean isWordStart(char c) { - return Character.isJavaIdentifierStart(c); - } - - @Override - public boolean isWordPart(char c) { - return Character.isJavaIdentifierPart(c); - } - - } -}
\ No newline at end of file diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxColors.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxColors.java deleted file mode 100644 index 716d6875d8..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxColors.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2018 Open Analytics NV and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor.syntax; - -import org.eclipse.swt.graphics.Color; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.themes.ITheme; - -public class SyntaxColors { - - private static final String COLOR_DEF_INSTRUCTION = "org.eclipse.linuxtools.docker.editor.color.instruction"; - private static final String COLOR_DEF_STRING = "org.eclipse.linuxtools.docker.editor.color.string"; - private static final String COLOR_DEF_COMMENT = "org.eclipse.linuxtools.docker.editor.color.comment"; - private static final String COLOR_DEF_VARIABLE = "org.eclipse.linuxtools.docker.editor.color.variable"; - - public static Color getInstructionColor() { - return getTheme().getColorRegistry().get(COLOR_DEF_INSTRUCTION); - } - - public static Color getStringColor() { - return getTheme().getColorRegistry().get(COLOR_DEF_STRING); - } - - public static Color getCommentColor() { - return getTheme().getColorRegistry().get(COLOR_DEF_COMMENT); - } - - public static Color getVariableColor() { - return getTheme().getColorRegistry().get(COLOR_DEF_VARIABLE); - } - - private static ITheme getTheme() { - return PlatformUI.getWorkbench().getThemeManager().getCurrentTheme(); - } -} diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxProblemReporter.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxProblemReporter.java deleted file mode 100644 index da555e7f3b..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxProblemReporter.java +++ /dev/null @@ -1,120 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2018 Open Analytics NV and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor.syntax; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IMarker; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.linuxtools.internal.docker.editor.scanner.DockerCommentScanner; -import org.eclipse.linuxtools.internal.docker.editor.scanner.InstructionWordRule; - -public class SyntaxProblemReporter { - - private static final String LINE_SEP = System.getProperty("line.separator"); - - public void checkAndApply(IDocument document, int offset, int length, IResource resource) - throws CoreException, BadLocationException { - - // We can't do problem report when file is external (no IResource) - if (resource == null) { - return; - } - boolean fullScan = (offset == 0 && length == document.getLength()); - - // Clear any existing markers in the affected region. - IMarker[] markers = resource.findMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO); - List<IMarker> markersToDelete = new ArrayList<>(); - for (IMarker marker : markers) { - int markerLineNr = (Integer) marker.getAttribute(IMarker.LINE_NUMBER); - int regionLineNr = document.getLineOfOffset(offset); - if (fullScan || markerLineNr == regionLineNr) - markersToDelete.add(marker); - } - for (IMarker marker : markersToDelete) - marker.delete(); - - // Apply new problems as needed. - List<SyntaxProblem> problems = check(document, offset, length); - for (SyntaxProblem problem : problems) { - IMarker marker = resource.createMarker(IMarker.PROBLEM); - marker.setAttribute(IMarker.SEVERITY, problem.severity); - marker.setAttribute(IMarker.MESSAGE, problem.message); - marker.setAttribute(IMarker.LINE_NUMBER, document.getLineOfOffset(problem.offset)); - marker.setAttribute(IMarker.CHAR_START, problem.offset); - marker.setAttribute(IMarker.CHAR_END, problem.offset + problem.length); - } - } - - public List<SyntaxProblem> check(IDocument document, int offset, int length) throws BadLocationException { - String region = document.get(offset, length); - int lineCount = region.split(LINE_SEP).length; - int startingLineNr = document.getLineOfOffset(offset); - - List<SyntaxProblem> problems = new ArrayList<>(); - - for (int lineNr = startingLineNr; lineNr < startingLineNr + lineCount; lineNr++) { - int lineOffset = document.getLineOffset(lineNr); - int lineEnd = document.getLength(); - if (lineNr + startingLineNr + 1 < lineCount) - lineEnd = document.getLineOffset(lineNr + 1); - - int endOfFirstWord = 0; - for (; endOfFirstWord < lineEnd - lineOffset; endOfFirstWord++) { - if (Character.isWhitespace(document.getChar(lineOffset + endOfFirstWord))) - break; - } - - String firstWord = document.get(lineOffset, endOfFirstWord); - if (firstWord.trim().isEmpty()) - continue; - if (firstWord.trim().startsWith(DockerCommentScanner.COMMENT_SEQUENCE)) - continue; - - String matchingInstruction = null; - for (String instr : InstructionWordRule.INSTRUCTIONS) { - if (instr.equalsIgnoreCase(firstWord)) { - matchingInstruction = instr; - break; - } - } - - if (matchingInstruction == null) { - // Error: unknown instruction - problems.add(new SyntaxProblem(IMarker.SEVERITY_ERROR, lineOffset, firstWord.length(), - "Unknown instruction: " + firstWord)); - } else if (!matchingInstruction.equals(firstWord)) { - // Warning: case incorrect - problems.add(new SyntaxProblem(IMarker.SEVERITY_WARNING, lineOffset, firstWord.length(), - "Instructions should be upper case")); - } - } - - return problems; - } - - public static class SyntaxProblem { - public int severity; - public int offset; - public int length; - public String message; - - public SyntaxProblem(int severity, int offset, int length, String message) { - this.severity = severity; - this.offset = offset; - this.length = length; - this.message = message; - } - } -} diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxReconcilingStrategy.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxReconcilingStrategy.java deleted file mode 100644 index 1251f6083b..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/syntax/SyntaxReconcilingStrategy.java +++ /dev/null @@ -1,63 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2018 Open Analytics NV and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor.syntax; - -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.reconciler.DirtyRegion; -import org.eclipse.jface.text.reconciler.IReconcilingStrategy; -import org.eclipse.jface.text.reconciler.IReconcilingStrategyExtension; -import org.eclipse.linuxtools.internal.docker.editor.Activator; -import org.eclipse.linuxtools.internal.docker.editor.DockerEditor; - -public class SyntaxReconcilingStrategy implements IReconcilingStrategy, IReconcilingStrategyExtension { - - private DockerEditor editor; - private IDocument document; - - public SyntaxReconcilingStrategy(DockerEditor editor) { - this.editor = editor; - } - - @Override - public void setDocument(IDocument document) { - this.document = document; - } - - @Override - public void reconcile(DirtyRegion dirtyRegion, IRegion subRegion) { - try { - IResource resource = editor.getEditorInput().getAdapter(IResource.class); - new SyntaxProblemReporter().checkAndApply(document, subRegion.getOffset(), subRegion.getLength(), resource); - } catch (CoreException | BadLocationException e) { - Activator.log(IStatus.ERROR, "Failed to perform syntax check", e); - } - } - - @Override - public void reconcile(IRegion partition) { - // Partition reconciling not supported. - } - - @Override - public void setProgressMonitor(IProgressMonitor monitor) { - // Monitoring not supported. - } - - @Override - public void initialReconcile() { - // Nothing to do. - } -} diff --git a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/util/AssetLoader.java b/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/util/AssetLoader.java deleted file mode 100644 index d0ddd473a1..0000000000 --- a/containers/org.eclipse.linuxtools.docker.editor/src/org/eclipse/linuxtools/internal/docker/editor/util/AssetLoader.java +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015, 2018 Open Analytics NV and others. - * - * This program and the accompanying materials are made - * available under the terms of the Eclipse Public License 2.0 - * which is available at https://www.eclipse.org/legal/epl-2.0/ - * - * SPDX-License-Identifier: EPL-2.0 - *******************************************************************************/ -package org.eclipse.linuxtools.internal.docker.editor.util; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.linuxtools.internal.docker.editor.Activator; - -public class AssetLoader { - - private Map<String, String> additionalInfos = new HashMap<>(); - private static final String ADDITIONAL_INFO_PATH = "assets/additional-info"; - - public AssetLoader() { - additionalInfos = new HashMap<>(); - } - - public String getInfo(String instruction) { - if (additionalInfos.containsKey(instruction)) - return additionalInfos.get(instruction); - - String additionalInfo = ""; - String targetFile = ADDITIONAL_INFO_PATH + "/" + instruction + ".html"; - try { - additionalInfo = AssetLoader.loadAsset(targetFile); - } catch (IOException e) { - Activator.log(IStatus.WARNING, "Failed to load additional info file for instruction " + instruction, e); - } - - additionalInfos.put(instruction, additionalInfo); - return additionalInfo; - } - - public static String loadAsset(String path) throws IOException { - URL url = FileLocator.find(Activator.getDefault().getBundle(), new Path(path), null); - if (url == null) { - return null; - } else { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - try (InputStream input = url.openStream()) { - - byte[] buffer = new byte[4096]; - int len = 0; - do { - len = input.read(buffer, 0, buffer.length); - if (len > 0) - out.write(buffer, 0, len); - } while (len >= 0); - } - return new String(out.toByteArray()); - } - } -} diff --git a/containers/pom.xml b/containers/pom.xml index eeb1d975f3..dbbd56ee8e 100644 --- a/containers/pom.xml +++ b/containers/pom.xml @@ -25,7 +25,6 @@ <modules> <module>org.eclipse.linuxtools.docker.core</module> <module>org.eclipse.linuxtools.docker.ui</module> - <module>org.eclipse.linuxtools.docker.editor</module> <module>org.eclipse.linuxtools.docker.tests.hamcrest-wrap</module> <module>org.eclipse.linuxtools.docker.ui.tests</module> <module>org.eclipse.linuxtools.docker.docs</module> |
