Added copyright headers and fixed some warnings
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/FilteredViewTree.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/FilteredViewTree.java
index 2a4fe10..f7b9509 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/FilteredViewTree.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/FilteredViewTree.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto;
import org.eclipse.swt.widgets.Composite;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/FindReplaceHandler.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/FindReplaceHandler.java
index 5f74f50..d7512d1 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/FindReplaceHandler.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/FindReplaceHandler.java
@@ -10,7 +10,6 @@
package org.eclipse.epsilon.picto;
import java.util.ListResourceBundle;
-
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.ui.IWorkbenchPart;
@@ -32,8 +31,8 @@
return new Object[][] {};
}
}, null, part);
+ // TODO org.eclipse.core.commands
ActionHandler actionHandler = new ActionHandler(findReplaceAction);
-
return actionHandler.execute(event);
} catch (Exception e) {
throw new ExecutionException("Could not execute command!", e);
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/GetImageOperationContributor.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/GetImageOperationContributor.java
index f55e244..95ede90 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/GetImageOperationContributor.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/GetImageOperationContributor.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto;
import java.io.File;
@@ -9,17 +18,16 @@
import java.nio.file.StandardCopyOption;
import java.util.HashMap;
import java.util.Map;
-
-import org.eclipse.epsilon.egl.EgxModule;
+import org.eclipse.epsilon.egl.IEgxModule;
import org.eclipse.epsilon.eol.execute.operations.contributors.OperationContributor;
import org.eclipse.epsilon.eol.types.EolNoType;
public class GetImageOperationContributor extends OperationContributor {
- protected EgxModule module;
+ protected IEgxModule module;
protected Map<String, String> cache = new HashMap<>();
- public GetImageOperationContributor(EgxModule module) {
+ public GetImageOperationContributor(IEgxModule module) {
this.module = module;
}
@@ -37,11 +45,11 @@
URI imageUri = module.getUri().resolve(path);
String tempImagePath = cache.get(imageUri.toString());
if (tempImagePath == null) {
- InputStream in = imageUri.toURL().openStream();
- Path temp = Files.createTempFile("picto", Paths.get(path).getFileName().toString());
- Files.copy(in, temp, StandardCopyOption.REPLACE_EXISTING);
- in.close();
- tempImagePath = temp.toAbsolutePath().toString();
+ try (InputStream in = imageUri.toURL().openStream()) {
+ Path temp = Files.createTempFile("picto", Paths.get(path).getFileName().toString());
+ Files.copy(in, temp, StandardCopyOption.REPLACE_EXISTING);
+ tempImagePath = temp.toAbsolutePath().toString();
+ }
cache.put(imageUri.toString(), tempImagePath);
}
return tempImagePath;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/Layer.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/Layer.java
index 47dac21..79a6626 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/Layer.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/Layer.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto;
public class Layer {
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/LazyEgxModule.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/LazyEgxModule.java
index b22503c..b2384c9 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/LazyEgxModule.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/LazyEgxModule.java
@@ -13,7 +13,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-
import org.eclipse.epsilon.common.module.ModuleElement;
import org.eclipse.epsilon.common.parse.AST;
import org.eclipse.epsilon.egl.EglTemplate;
@@ -27,10 +26,7 @@
import org.eclipse.epsilon.eol.execute.context.FrameType;
import org.eclipse.epsilon.eol.execute.context.IEolContext;
import org.eclipse.epsilon.eol.execute.context.Variable;
-import org.eclipse.epsilon.eol.execute.operations.contributors.OperationContributor;
import org.eclipse.epsilon.eol.types.EolAnyType;
-import org.eclipse.epsilon.eol.types.EolNoType;
-import org.eclipse.epsilon.eol.types.EolNoType.EolNoTypeInstance;
public class LazyEgxModule extends EgxModule {
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/PictoEditor.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/PictoEditor.java
index 415b932..87402cf 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/PictoEditor.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/PictoEditor.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto;
import org.eclipse.epsilon.flexmi.dt.FlexmiEditor;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/PictoPlugin.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/PictoPlugin.java
index 65b4b3e..ac2b2db 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/PictoPlugin.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/PictoPlugin.java
@@ -10,6 +10,7 @@
package org.eclipse.epsilon.picto;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ResourceLocator;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -57,7 +58,7 @@
}
public ImageDescriptor getImageDescriptor(String path) {
- return imageDescriptorFromPlugin(PLUGIN_ID, path);
+ return ResourceLocator.imageDescriptorFromBundle(PLUGIN_ID, path).orElse(null);
}
}
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/ViewContent.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/ViewContent.java
index ba5cc99..5582c09 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/ViewContent.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/ViewContent.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto;
import java.io.File;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/ViewTree.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/ViewTree.java
index 9dbad62..677e7dc 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/ViewTree.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/ViewTree.java
@@ -27,7 +27,7 @@
protected String name = "";
protected String format = "html";
protected String icon = "folder";
- protected List<Patch> patches = new ArrayList<Patch>();
+ protected List<Patch> patches = new ArrayList<>();
protected ViewTree parent;
protected Point scrollPosition = new Point(0, 0);
protected ViewContent cachedContent = null;
@@ -191,7 +191,7 @@
}
public List<ViewContent> getContents(ViewRenderer viewRenderer) {
- List<ViewContent> viewContents = new ArrayList<ViewContent>();
+ List<ViewContent> viewContents = new ArrayList<>();
ViewContent viewContent = getContent();
while (viewContent != null) {
viewContents.add(viewContent);
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/LayersMenuAction.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/LayersMenuAction.java
index c6a3105..861647c 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/LayersMenuAction.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/LayersMenuAction.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.actions;
import org.eclipse.epsilon.picto.Layer;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/LockAction.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/LockAction.java
index 8c34c31..2f0a3be 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/LockAction.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/LockAction.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.actions;
import org.eclipse.epsilon.picto.PictoPlugin;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/PrintAction.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/PrintAction.java
index a96d23c..4e031a6 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/PrintAction.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/PrintAction.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.actions;
import org.eclipse.epsilon.picto.ViewRenderer;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/RenderActiveViewAction.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/RenderActiveViewAction.java
index eb6a4c9..5e4095b 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/RenderActiveViewAction.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/RenderActiveViewAction.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.actions;
import java.util.List;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/RenderViewContentAction.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/RenderViewContentAction.java
index b656687..543acc9 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/RenderViewContentAction.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/RenderViewContentAction.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.actions;
import java.util.List;
@@ -5,8 +14,6 @@
import org.eclipse.epsilon.picto.ViewContent;
import org.eclipse.epsilon.picto.ViewRenderer;
import org.eclipse.jface.action.Action;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.PlatformUI;
public class RenderViewContentAction extends Action {
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/SetLayerActiveAction.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/SetLayerActiveAction.java
index f248bda..f1d8842 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/SetLayerActiveAction.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/SetLayerActiveAction.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.actions;
import org.eclipse.epsilon.picto.Layer;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/SyncAction.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/SyncAction.java
index f920413..602507a 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/SyncAction.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/SyncAction.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.actions;
import org.eclipse.epsilon.picto.PictoView;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/ViewContentsMenuAction.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/ViewContentsMenuAction.java
index d84dfde..dff7fd5 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/ViewContentsMenuAction.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/ViewContentsMenuAction.java
@@ -1,8 +1,15 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.actions;
-import java.util.ArrayList;
import java.util.List;
-
import org.eclipse.epsilon.picto.PictoPlugin;
import org.eclipse.epsilon.picto.PictoView;
import org.eclipse.epsilon.picto.ViewContent;
@@ -42,7 +49,7 @@
item.fill(viewContentsMenu, 0);
}
- if (viewContents.stream().filter(vc -> vc.isActive()).findAny().orElse(null) != null) {
+ if (viewContents.stream().anyMatch(vc -> vc != null && vc.isActive())) {
new Separator().fill(viewContentsMenu, 0);
new ActionContributionItem(new RenderActiveViewAction(pictoView, viewContents)).fill(viewContentsMenu, 0);
}
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/ZoomAction.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/ZoomAction.java
index a12c2d9..2ad6e6a 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/ZoomAction.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/actions/ZoomAction.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.actions;
import org.eclipse.epsilon.picto.PictoPlugin;
@@ -9,8 +18,7 @@
protected ZoomType type;
protected ViewRenderer viewRenderer;
-
-
+
public ZoomAction(ZoomType type, ViewRenderer viewRenderer) {
this.type = type;
this.viewRenderer = viewRenderer;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/CustomViewImpl.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/CustomViewImpl.java
index 6e6a24b..6a4222f 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/CustomViewImpl.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/CustomViewImpl.java
@@ -180,7 +180,7 @@
@Override
public EList<String> getPath() {
if (path == null) {
- path = new EDataTypeUniqueEList<String>(String.class, this, PictoPackage.CUSTOM_VIEW__PATH);
+ path = new EDataTypeUniqueEList<>(String.class, this, PictoPackage.CUSTOM_VIEW__PATH);
}
return path;
}
@@ -285,7 +285,7 @@
@Override
public EList<Patch> getPatches() {
if (patches == null) {
- patches = new EObjectContainmentEList<Patch>(Patch.class, this, PictoPackage.CUSTOM_VIEW__PATCHES);
+ patches = new EObjectContainmentEList<>(Patch.class, this, PictoPackage.CUSTOM_VIEW__PATCHES);
}
return patches;
}
@@ -298,7 +298,7 @@
@Override
public EList<Parameter> getParameters() {
if (parameters == null) {
- parameters = new EObjectContainmentEList<Parameter>(Parameter.class, this, PictoPackage.CUSTOM_VIEW__PARAMETERS);
+ parameters = new EObjectContainmentEList<>(Parameter.class, this, PictoPackage.CUSTOM_VIEW__PARAMETERS);
}
return parameters;
}
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/ModelImpl.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/ModelImpl.java
index 2e168b6..ce300fa 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/ModelImpl.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/ModelImpl.java
@@ -161,7 +161,7 @@
@Override
public EList<Parameter> getParameters() {
if (parameters == null) {
- parameters = new EObjectContainmentEList<Parameter>(Parameter.class, this, PictoPackage.MODEL__PARAMETERS);
+ parameters = new EObjectContainmentEList<>(Parameter.class, this, PictoPackage.MODEL__PARAMETERS);
}
return parameters;
}
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/ParameterImpl.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/ParameterImpl.java
index 049f72e..cc5a021 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/ParameterImpl.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/ParameterImpl.java
@@ -175,7 +175,7 @@
@Override
public EList<Object> getValues() {
if (values == null) {
- values = new EDataTypeUniqueEList<Object>(Object.class, this, PictoPackage.PARAMETER__VALUES);
+ values = new EDataTypeUniqueEList<>(Object.class, this, PictoPackage.PARAMETER__VALUES);
}
return values;
}
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/PictoImpl.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/PictoImpl.java
index 31df2cc..f7248f8 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/PictoImpl.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/dom/impl/PictoImpl.java
@@ -229,7 +229,7 @@
@Override
public EList<Model> getModels() {
if (models == null) {
- models = new EObjectContainmentEList<Model>(Model.class, this, PictoPackage.PICTO__MODELS);
+ models = new EObjectContainmentEList<>(Model.class, this, PictoPackage.PICTO__MODELS);
}
return models;
}
@@ -242,7 +242,7 @@
@Override
public EList<Parameter> getParameters() {
if (parameters == null) {
- parameters = new EObjectContainmentEList<Parameter>(Parameter.class, this, PictoPackage.PICTO__PARAMETERS);
+ parameters = new EObjectContainmentEList<>(Parameter.class, this, PictoPackage.PICTO__PARAMETERS);
}
return parameters;
}
@@ -255,7 +255,7 @@
@Override
public EList<CustomView> getCustomViews() {
if (customViews == null) {
- customViews = new EObjectContainmentEList<CustomView>(CustomView.class, this, PictoPackage.PICTO__CUSTOM_VIEWS);
+ customViews = new EObjectContainmentEList<>(CustomView.class, this, PictoPackage.PICTO__CUSTOM_VIEWS);
}
return customViews;
}
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/source/EglPictoSource.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/source/EglPictoSource.java
index 4529269..5431e9b 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/source/EglPictoSource.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/source/EglPictoSource.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.source;
import java.io.File;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/source/FlexmiSource.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/source/FlexmiSource.java
index 814a2a0..095e025 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/source/FlexmiSource.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/source/FlexmiSource.java
@@ -12,7 +12,6 @@
import java.io.File;
import java.io.IOException;
import java.net.URISyntaxException;
-
import org.eclipse.core.resources.IFile;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
@@ -28,7 +27,6 @@
import org.eclipse.epsilon.picto.dom.Picto;
import org.eclipse.epsilon.picto.dom.PictoFactory;
import org.eclipse.ui.IEditorPart;
-import org.w3c.dom.ProcessingInstruction;
public class FlexmiSource extends EglPictoSource {
@@ -37,20 +35,21 @@
FlexmiResource resource = (FlexmiResource) getResource(editorPart);
if (resource == null) return null;
- ProcessingInstruction renderProcessingInstruction = (ProcessingInstruction) ((FlexmiResource) resource).
- getProcessingInstructions().stream().filter(p -> p.getTarget().startsWith("render-")).findFirst().orElse(null);
- if (renderProcessingInstruction != null) {
- Picto metadata = PictoFactory.eINSTANCE.createPicto();
- metadata.setFormat(renderProcessingInstruction.getTarget().substring("render-".length()));
- metadata.setTemplate(renderProcessingInstruction.getData().trim());
- return metadata;
- }
- return null;
+ return resource
+ .getProcessingInstructions().stream()
+ .filter(p -> p.getTarget().startsWith("render-"))
+ .findFirst()
+ .map(renderProcessingInstruction -> {
+ Picto metadata = PictoFactory.eINSTANCE.createPicto();
+ metadata.setFormat(renderProcessingInstruction.getTarget().substring("render-".length()));
+ metadata.setTemplate(renderProcessingInstruction.getData().trim());
+ return metadata;
+ })
+ .orElse(null);
}
@Override
- public Resource getResource(IEditorPart editorPart) {
-
+ public Resource getResource(IEditorPart editorPart) {
IFile file = waitForFile(editorPart);
if (file == null) return null;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/source/VerbatimSource.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/source/VerbatimSource.java
index d34501b..7b5cec0 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/source/VerbatimSource.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/source/VerbatimSource.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.source;
import java.io.File;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/ExceptionContentTransformer.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/ExceptionContentTransformer.java
index 12b4bb9..a18894a 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/ExceptionContentTransformer.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/ExceptionContentTransformer.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.transformers;
import java.util.Collections;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/GraphvizContentTransformer.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/GraphvizContentTransformer.java
index 26d7243..c008cec 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/GraphvizContentTransformer.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/GraphvizContentTransformer.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.transformers;
import java.io.File;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/HtmlContentTransformer.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/HtmlContentTransformer.java
index eca6af3..d07687e 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/HtmlContentTransformer.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/HtmlContentTransformer.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.transformers;
import org.eclipse.epsilon.picto.ViewContent;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/PatchContentTransformer.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/PatchContentTransformer.java
index fbde1be..0d65063 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/PatchContentTransformer.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/PatchContentTransformer.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.transformers;
import java.util.ArrayList;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/SvgContentTransformer.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/SvgContentTransformer.java
index 1508ab2..f5ad9e8 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/SvgContentTransformer.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/SvgContentTransformer.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.transformers;
import org.eclipse.epsilon.picto.ViewContent;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/TextContentTransformer.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/TextContentTransformer.java
index b7d5af2..763b162 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/TextContentTransformer.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/TextContentTransformer.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.transformers;
import java.io.File;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/ViewContentTransformer.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/ViewContentTransformer.java
index 2d2b96d..1431421 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/ViewContentTransformer.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/ViewContentTransformer.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.transformers;
import org.eclipse.epsilon.picto.ViewContent;
diff --git a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/ViewContentTransformerExtensionPointManager.java b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/ViewContentTransformerExtensionPointManager.java
index 01c1c28..6aa839d 100644
--- a/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/ViewContentTransformerExtensionPointManager.java
+++ b/plugins/org.eclipse.epsilon.picto/src/org/eclipse/epsilon/picto/transformers/ViewContentTransformerExtensionPointManager.java
@@ -1,3 +1,12 @@
+/*********************************************************************
+* Copyright (c) 2008 The University of York.
+*
+* 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.epsilon.picto.transformers;
import org.eclipse.core.runtime.IConfigurationElement;
