Skip to content
Snippets Groups Projects
Commit eb6c5ce1 authored by Daniel Felipe GONZALEZ OBANDO's avatar Daniel Felipe GONZALEZ OBANDO
Browse files

Merge branch 'hotfix/set-min-java-version-to-6-or-7' into develop

parents de85a33b aaea566f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 53 additions and 49 deletions
.classpath
+ 1
− 1
View file @ eb6c5ce1
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="var" path="ICY_JAR"/>
<classpathentry kind="var" path="ICY_PLUGINS/adufour/ezplug/EzPlug.jar"/>
<classpathentry kind="var" path="ICY_PLUGINS/adufour/blocks/Blocks.jar"/>
......
src/plugins/tprovoost/scripteditor/scriptblock/editor/VarScriptEditor.java
+ 26
− 21
View file @ eb6c5ce1
......@@ -35,7 +35,7 @@ import plugins.tprovoost.scripteditor.scriptinghandlers.VariableType;
public abstract class VarScriptEditor extends SwingVarEditor<Script> {
private ScriptingPanel panelIn;
private ScriptingPanel panelOut;
private IcyFrame frame;
private IcyFrameListener frameListener;
......@@ -53,12 +53,15 @@ public abstract class VarScriptEditor extends SwingVarEditor<Script> {
setNameVisible(false);
setComponentResizeable(true);
JPanel component = buildComponentPanel();
Set<VarMutable> inputVariables = getVariable().getInputVariables();
Set<VarMutable> outputVariables = getVariable().getOutputVariables();
ThreadUtil.invokeLater(() -> {
setupVariables(inputVariables, outputVariables);
panelIn.getScriptHandler().interpret(false);
panelOut.getScriptHandler().interpret(false);
final Set<VarMutable> inputVariables = getVariable().getInputVariables();
final Set<VarMutable> outputVariables = getVariable().getOutputVariables();
ThreadUtil.invokeLater(new Runnable() {
@Override
public void run() {
setupVariables(inputVariables, outputVariables);
panelIn.getScriptHandler().interpret(false);
panelOut.getScriptHandler().interpret(false);
}
});
return component;
}
......@@ -76,17 +79,17 @@ public abstract class VarScriptEditor extends SwingVarEditor<Script> {
panelIn.setText(getVariable().getCode());
panelIn.getTextArea().setCaretPosition(0);
panelIn.getTextArea().getDocument().addDocumentListener(new DocumentListener() {
@Override
public void removeUpdate(DocumentEvent e) {
getVariable().getValue().updateCode(panelIn.getTextArea().getText());
}
@Override
public void insertUpdate(DocumentEvent e) {
getVariable().getValue().updateCode(panelIn.getTextArea().getText());
}
@Override
public void changedUpdate(DocumentEvent e) {
}
......@@ -105,19 +108,18 @@ public abstract class VarScriptEditor extends SwingVarEditor<Script> {
}
}
private JPanel buildInternalEastPanel() {
JPanel eastPanel = new JPanel();
eastPanel.setOpaque(false);
eastPanel.setLayout(new BoxLayout(eastPanel, BoxLayout.Y_AXIS));
eastPanel.add(Box.createVerticalGlue());
IcyButton editButton = new IcyButton(new IcyIcon("redo.png", 12));
eastPanel.add(editButton);
eastPanel.add(Box.createVerticalGlue());
buildExternalEditorFrame();
editButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
......@@ -129,18 +131,17 @@ public abstract class VarScriptEditor extends SwingVarEditor<Script> {
frame.requestFocus();
}
});
return eastPanel;
}
private void buildExternalEditorFrame() {
frame = new IcyFrame("External Editor", true, true, true, true);
frame.setSize(500, 500);
buildExternalPanel();
frame.setContentPane(panelOut);
frame.addToDesktopPane();
frame.setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
frame.center();
......@@ -194,7 +195,7 @@ public abstract class VarScriptEditor extends SwingVarEditor<Script> {
}
private void setupVariables(Set<VarMutable> inputVariables, Set<VarMutable> outputVariables,
ScriptingHandler handler) {
final ScriptingHandler handler) {
HashMap<String, ScriptVariable> handlerVariables = handler.getExternalVariables();
handlerVariables.clear();
......@@ -204,8 +205,12 @@ public abstract class VarScriptEditor extends SwingVarEditor<Script> {
for (Var<?> outputVar : outputVariables) {
handlerVariables.put(outputVar.getName(), new ScriptVariable(new VariableType(outputVar.getType())));
}
ThreadUtil.invokeLater(() -> {
handler.interpret(false);
ThreadUtil.invokeLater(new Runnable() {
@Override
public void run() {
handler.interpret(false);
}
});
}
}
src/plugins/tprovoost/scripteditor/scriptblock/script/DefaultScript.java
+ 2
− 3
View file @ eb6c5ce1
......@@ -6,7 +6,6 @@ import java.util.HashSet;
import java.util.Set;
import plugins.adufour.vars.lang.VarMutable;
import plugins.tprovoost.scripteditor.scriptblock.VarMutableScript;
public abstract class DefaultScript implements Script {
......@@ -18,10 +17,10 @@ public abstract class DefaultScript implements Script {
}
public DefaultScript(String code) {
this(code, Collections.emptyList());
this(code, Collections.<VarMutable>emptyList());
}
public DefaultScript(String code, Collection<VarMutableScript> variables) {
public DefaultScript(String code, Collection<VarMutable> variables) {
this.code = code;
this.variables = new HashSet<>(variables);
}
......
src/plugins/tprovoost/scripteditor/scriptblock/script/JavaScriptScript.java
+ 3
− 3
View file @ eb6c5ce1
......@@ -3,7 +3,7 @@ package plugins.tprovoost.scripteditor.scriptblock.script;
import java.util.Collection;
import java.util.Collections;
import plugins.tprovoost.scripteditor.scriptblock.VarMutableScript;
import plugins.adufour.vars.lang.VarMutable;
public class JavaScriptScript extends DefaultScript {
......@@ -12,10 +12,10 @@ public class JavaScriptScript extends DefaultScript {
}
public JavaScriptScript(String code) {
this(code, Collections.emptyList());
this(code, Collections.<VarMutable>emptyList());
}
public JavaScriptScript(String code, Collection<VarMutableScript> variables) {
public JavaScriptScript(String code, Collection<VarMutable> variables) {
super(code, variables);
}
......
src/plugins/tprovoost/scripteditor/scriptblock/script/PythonScript.java
+ 3
− 3
View file @ eb6c5ce1
......@@ -3,7 +3,7 @@ package plugins.tprovoost.scripteditor.scriptblock.script;
import java.util.Collection;
import java.util.Collections;
import plugins.tprovoost.scripteditor.scriptblock.VarMutableScript;
import plugins.adufour.vars.lang.VarMutable;
public class PythonScript extends DefaultScript {
......@@ -12,10 +12,10 @@ public class PythonScript extends DefaultScript {
}
public PythonScript(String code) {
this(code, Collections.emptyList());
this(code, Collections.<VarMutable>emptyList());
}
public PythonScript(String code, Collection<VarMutableScript> variables) {
public PythonScript(String code, Collection<VarMutable> variables) {
super(code, variables);
}
......
src/plugins/tprovoost/scripteditor/scriptblock/var/VarJavaScriptScript.java
+ 7
− 7
View file @ eb6c5ce1
......@@ -4,29 +4,29 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import plugins.adufour.vars.lang.VarMutable;
import plugins.adufour.vars.util.VarListener;
import plugins.tprovoost.scripteditor.scriptblock.VarMutableScript;
import plugins.tprovoost.scripteditor.scriptblock.script.JavaScriptScript;
import plugins.tprovoost.scripteditor.scriptblock.script.Script;
public class VarJavaScriptScript extends VarScript {
public VarJavaScriptScript(String name, String defaultValue) {
this(name, defaultValue, Collections.emptySet(), Collections.emptySet());
this(name, defaultValue, Collections.<VarMutable>emptySet(), Collections.<VarMutable>emptySet());
}
public VarJavaScriptScript(String name, String defaultValue, Collection<VarMutableScript> inputVariables,
Collection<VarMutableScript> outputVariables) throws NullPointerException {
public VarJavaScriptScript(String name, String defaultValue, Collection<VarMutable> inputVariables,
Collection<VarMutable> outputVariables) throws NullPointerException {
this(name, defaultValue, inputVariables, outputVariables, null);
}
public VarJavaScriptScript(String name, String defaultValue, VarListener<Script> defaultListener)
throws NullPointerException {
this(name, defaultValue, Collections.emptyList(), Collections.emptyList(), defaultListener);
this(name, defaultValue, Collections.<VarMutable>emptyList(), Collections.<VarMutable>emptyList(), defaultListener);
}
public VarJavaScriptScript(String name, String defaultValue, Collection<VarMutableScript> inputVariables,
Collection<VarMutableScript> outputVariables, VarListener<Script> defaultListener)
public VarJavaScriptScript(String name, String defaultValue, Collection<VarMutable> inputVariables,
Collection<VarMutable> outputVariables, VarListener<Script> defaultListener)
throws NullPointerException {
super(name, new JavaScriptScript(filterNullValue(defaultValue)), defaultListener);
this.inputVariables = new HashSet<>(inputVariables);
......
src/plugins/tprovoost/scripteditor/scriptblock/var/VarPythonScript.java
+ 9
− 9
View file @ eb6c5ce1
......@@ -4,30 +4,30 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import plugins.adufour.vars.lang.VarMutable;
import plugins.adufour.vars.util.VarListener;
import plugins.tprovoost.scripteditor.scriptblock.VarMutableScript;
import plugins.tprovoost.scripteditor.scriptblock.script.PythonScript;
import plugins.tprovoost.scripteditor.scriptblock.script.Script;
public class VarPythonScript extends VarScript {
public VarPythonScript(String name, String defaultValue) {
this(name, defaultValue, Collections.emptySet(), Collections.emptySet());
this(name, defaultValue, Collections.<VarMutable>emptySet(), Collections.<VarMutable>emptySet());
}
public VarPythonScript(String name, String defaultValue, Collection<VarMutableScript> inputVariables,
Collection<VarMutableScript> outputVariables) throws NullPointerException {
public VarPythonScript(String name, String defaultValue, Collection<VarMutable> inputVariables,
Collection<VarMutable> outputVariables) throws NullPointerException {
this(name, defaultValue, inputVariables, outputVariables, null);
}
public VarPythonScript(String name, String defaultValue, VarListener<Script> defaultListener)
throws NullPointerException {
this(name, defaultValue, Collections.emptyList(), Collections.emptyList(), defaultListener);
this(name, defaultValue, Collections.<VarMutable>emptyList(), Collections.<VarMutable>emptyList(),
defaultListener);
}
public VarPythonScript(String name, String defaultValue, Collection<VarMutableScript> inputVariables,
Collection<VarMutableScript> outputVariables, VarListener<Script> defaultListener)
throws NullPointerException {
public VarPythonScript(String name, String defaultValue, Collection<VarMutable> inputVariables,
Collection<VarMutable> outputVariables, VarListener<Script> defaultListener) throws NullPointerException {
super(name, new PythonScript(filterNullValue(defaultValue)), defaultListener);
this.inputVariables = new HashSet<>(inputVariables);
this.outputVariables = new HashSet<>(outputVariables);
......
src/plugins/tprovoost/scripteditor/scriptblock/var/VarScript.java
+ 2
− 2
View file @ eb6c5ce1
......@@ -19,7 +19,7 @@ public abstract class VarScript extends Var<Script> {
Set<VarMutable> outputVariables;
public VarScript(String name, Script defaultValue) {
this(name, defaultValue, Collections.emptySet(), Collections.emptySet());
this(name, defaultValue, Collections.<VarMutable>emptySet(), Collections.<VarMutable>emptySet());
}
public VarScript(String name, Script defaultValue, Collection<VarMutable> inputVariables,
......@@ -29,7 +29,7 @@ public abstract class VarScript extends Var<Script> {
public VarScript(String name, Script defaultValue, VarListener<Script> defaultListener)
throws NullPointerException {
this(name, defaultValue, Collections.emptyList(), Collections.emptyList(), defaultListener);
this(name, defaultValue, Collections.<VarMutable>emptyList(), Collections.<VarMutable>emptyList(), defaultListener);
}
public VarScript(String name, Script defaultValue, Collection<VarMutable> inputVariables,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment