Removed unused OldAstViewer
diff --git a/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/EmptyModel.java b/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/EmptyModel.java
index aeeb5da..f822bcf 100644
--- a/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/EmptyModel.java
+++ b/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/EmptyModel.java
@@ -19,7 +19,6 @@
public class EmptyModel extends Model {
-
@Override
public void load() throws EolModelLoadingException {
@@ -143,4 +142,11 @@
public boolean isModelElement(Object instance) {
return false;
}
+
+ /**
+ * @since 1.6
+ */
+ public boolean isLoaded() {
+ return true;
+ }
}
diff --git a/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/Model.java b/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/Model.java
index 75188f0..fcb310d 100644
--- a/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/Model.java
+++ b/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/Model.java
@@ -172,6 +172,7 @@
}
NoModelTransactionSupport transactionSupport = new NoModelTransactionSupport();
+
@Override
public IModelTransactionSupport getTransactionSupport() {
return transactionSupport;
diff --git a/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/ModelGroup.java b/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/ModelGroup.java
index dd87e36..0f1c5dd 100644
--- a/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/ModelGroup.java
+++ b/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/ModelGroup.java
@@ -33,8 +33,8 @@
public ModelGroup(ModelRepository repository, String metaModel) throws EolModelNotFoundException {
this.name = metaModel;
- for (IModel model : repository.getModels()){
- if (model.getAliases().contains(metaModel)){
+ for (IModel model : repository.getModels()) {
+ if (model.getAliases().contains(metaModel)) {
models.add(model);
}
}
diff --git a/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/java/JavaModel.java b/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/java/JavaModel.java
index 01d16ca..902bb76 100644
--- a/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/java/JavaModel.java
+++ b/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/java/JavaModel.java
@@ -300,4 +300,11 @@
objects = null;
classes = null;
}
+
+ /**
+ * @since 1.6
+ */
+ public boolean isLoaded() {
+ return objects != null;
+ }
}
diff --git a/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/parse/AstExplorer.java b/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/parse/AstExplorer.java
index e5270f5..3d25b22 100644
--- a/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/parse/AstExplorer.java
+++ b/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/parse/AstExplorer.java
@@ -73,34 +73,42 @@
return (Tree) o;
}
+ @Override
public Object getRoot() {
return tree;
}
+ @Override
public Object getChild(Object arg0, int arg1) {
Tree child = toTree(arg0);
return child.getChild(arg1);
}
+ @Override
public int getChildCount(Object arg0) {
return toTree(arg0).getChildCount();
}
+ @Override
public boolean isLeaf(Object arg0) {
return toTree(arg0).getChildCount() == 0;
}
+ @Override
public void valueForPathChanged(TreePath arg0, Object arg1) {
}
+ @Override
public int getIndexOfChild(Object arg0, Object arg1) {
return 0;
}
+ @Override
public void addTreeModelListener(TreeModelListener arg0) {
}
+ @Override
public void removeTreeModelListener(TreeModelListener arg0) {
}
@@ -109,6 +117,9 @@
class AstTreeCellRenderer extends DefaultTreeCellRenderer {
+ private static final long serialVersionUID = -3570380286525845027L;
+
+ @Override
public Component getTreeCellRendererComponent(JTree arg0, Object arg1,
boolean selected, boolean expanded, boolean leaf, int row,
boolean arg6) {
diff --git a/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/parse/OldAstViewer.java b/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/parse/OldAstViewer.java
deleted file mode 100644
index d6672c2..0000000
--- a/plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/parse/OldAstViewer.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * 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/
- *
- * Contributors:
- * Dimitrios Kolovos - initial API and implementation
- ******************************************************************************/
-package org.eclipse.epsilon.eol.parse;
-
-import java.awt.Component;
-import java.awt.SystemColor;
-
-import javax.swing.ImageIcon;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JScrollPane;
-import javax.swing.JTree;
-import javax.swing.event.TreeModelListener;
-import javax.swing.tree.TreeCellRenderer;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreePath;
-
-import org.eclipse.epsilon.common.parse.AST;
-import org.eclipse.epsilon.common.util.StringUtil;
-
-
-public class OldAstViewer extends JFrame{
- JTree tree = new JTree();
-
- //TODO: Add support for viewing properties of RichAst
- public OldAstViewer(AST ast){
-
- tree.setModel(new ASTModel(ast));
- tree.setCellRenderer(new ASTTreeCellRenderer());
- this.getContentPane().add(new JScrollPane(tree));
-
- this.setTitle("AST Viewer");
- this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
- this.setBounds(100,100,500,500);
- this.setVisible(true);
- }
-
- class ASTModel implements TreeModel{
-
- private AST ast = null;
-
- public ASTModel(AST ast){
- this.ast = ast;
- }
-
- public AST toAST(Object o){
- return (AST) o;
- }
-
- public Object getRoot() {
- return ast;
- }
-
- public Object getChild(Object arg0, int arg1) {
- AST child = toAST(arg0).getFirstChild();
- for (int i=0;i<arg1;i++){
- child = child.getNextSibling();
- if (child == null) return ((AST)arg0).getAnnotationsAst();
- }
- return child;
- }
-
- public int getChildCount(Object arg0) {
- if (((AST) arg0).getAnnotationsAst() != null) {
- return toAST(arg0).getNumberOfChildren() + 1;
- }
- else {
- return toAST(arg0).getNumberOfChildren();
- }
- }
-
- public boolean isLeaf(Object arg0) {
- return toAST(arg0).getNumberOfChildren() == 0;
- }
-
- public void valueForPathChanged(TreePath arg0, Object arg1) {
- }
-
- public int getIndexOfChild(Object arg0, Object arg1) {
- return 0;
- }
-
- public void addTreeModelListener(TreeModelListener arg0) {
-
- }
-
- public void removeTreeModelListener(TreeModelListener arg0) {
-
- }
-
- }
-
- class ASTTreeCellRenderer implements TreeCellRenderer{
-
- public Component getTreeCellRendererComponent(JTree arg0, Object arg1, boolean selected, boolean expanded, boolean leaf, int row, boolean arg6) {
- JLabel label = new JLabel();
-
- AST ast = (AST) arg1;
-
- if (selected){
- label.setOpaque(true);
- label.setBackground(SystemColor.activeCaption);
- label.setForeground(SystemColor.activeCaptionText);
- }
-
- label.setIcon(new ImageIcon(ASTTreeCellRenderer.class.getResource("node.gif")));
-
- label.setText("<html>" +
- getText(ast)
- + " (" + ast.getType() + ")"
- + "<font color='#C0C0C0'>"
- + " (Line:" + ast.getLine() + ",Col:"
- + ast.getColumn() //+ ", Props: "
- //+ toString(((EolAst) ast).getProperties())
- //+ (ast instanceof FileAst ? ((FileAst) ast).getFile().getAbsolutePath() : "")
- + ")"
- + "</font>"
- + "</html>");
-
- return label;
- }
-
- private String getText(AST ast){
- String str = StringUtil.escapeHtml(ast.getText());
- str = str.replaceAll("\r", "<font color='#336699'>\\\\r</font>");
- str = str.replaceAll("\n", "<font color='#336699'>\\\\n</font>");
- str = str.replaceAll("\t", "<font color='#336699'>\\\\t</font>");
- return str;
- }
- }
-
-
-
-}
diff --git a/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/MathTests.java b/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/MathTests.java
index 40fb35a..e0a17dc 100644
--- a/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/MathTests.java
+++ b/tests/org.eclipse.epsilon.eol.engine.test.acceptance/src/org/eclipse/epsilon/eol/engine/test/acceptance/MathTests.java
@@ -7,7 +7,6 @@
* Contributors:
* Dimitrios Kolovos - initial API and implementation
******************************************************************************/
-
package org.eclipse.epsilon.eol.engine.test.acceptance;
import org.eclipse.epsilon.eol.engine.test.acceptance.eunit.EUnitRunner;
