Thread: [Exmmt-commit] SF.net SVN: exmmt: [6] net.sourceforge.exmmt/src/java/net/sourceforge/exmmt
Status: Inactive
Brought to you by:
lgrammel
Menu
▾
▴
exmmt-commit
|
From: <lgr...@us...> - 2006-05-16 20:29:15
|
Revision: 6 Author: lgrammel Date: 2006-05-16 13:28:40 -0700 (Tue, 16 May 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=6&view=rev Log Message: ----------- #1489785 refactor model editor Modified Paths: -------------- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AdditionPoint.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AdditionPointFactory.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AdditionPointFactoryFactory.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ApplyMappingsFactory.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ApplyMappingsFactoryFactory.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Area.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AreaFactory.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AreaFactoryFactory.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/DisplayVisitor.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/FixedLiteral.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/FixedLiteralFactory.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/FixedLiteralFactoryFactory.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IFocusChecker.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Line.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/LineFactory.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/LineFactoryFactory.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Literal.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ModelEditor.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ModelText.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/NavigationElementSearcher.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/VariableFactory.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/VariableFactoryFactory.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/VariableLiteral.java Added Paths: ----------- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IMetaMetaModelElement.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IMetaModelElement.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IModelElement.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IModelElementVisitor.java Removed Paths: ------------- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayElementFactoryFactory.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayMapping.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayModelElement.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayModelElementVisitor.java Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AdditionPoint.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AdditionPoint.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AdditionPoint.java 2006-05-16 20:28:40 UTC (rev 6) @@ -17,11 +17,11 @@ import org.jdom.Element; -public class AdditionPoint implements IDisplayModelElement { +public class AdditionPoint implements IModelElement { private Element parent; - private Map<String, IDisplayMapping> mappingMap; + private Map<String, IMetaModelElement> mappingMap; private Area parentArea; @@ -30,7 +30,7 @@ private Map<String, String> defaultValueMap; public AdditionPoint(Element parent, - Map<String, IDisplayMapping> mappingMap, Area parentArea, + Map<String, IMetaModelElement> mappingMap, Area parentArea, Map<String, String> defaultValueMap, String childElementName) { assert parent != null; @@ -42,7 +42,7 @@ this.parentArea = parentArea; } - public void accept(IDisplayModelElementVisitor visitor) { + public void accept(IModelElementVisitor visitor) { visitor.visit(this); } Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AdditionPointFactory.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AdditionPointFactory.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AdditionPointFactory.java 2006-05-16 20:28:40 UTC (rev 6) @@ -16,15 +16,15 @@ import org.jdom.Element; -public class AdditionPointFactory implements IDisplayMapping { +public class AdditionPointFactory implements IMetaModelElement { - private Map<String, IDisplayMapping> mappingMap; + private Map<String, IMetaModelElement> mappingMap; private String childElementName; private Map<String, String> defaultValueMap; - public AdditionPointFactory(Map<String, IDisplayMapping> mappingMap, + public AdditionPointFactory(Map<String, IMetaModelElement> mappingMap, Map<String, String> defaultValueMap, String childElementName) { this.defaultValueMap = defaultValueMap; @@ -32,7 +32,7 @@ this.mappingMap = mappingMap; } - public AdditionPoint create(Element element, IDisplayModelElement parent) { + public AdditionPoint create(Element element, IModelElement parent) { return new AdditionPoint(element, mappingMap, (Area) parent, defaultValueMap, childElementName); } Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AdditionPointFactoryFactory.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AdditionPointFactoryFactory.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AdditionPointFactoryFactory.java 2006-05-16 20:28:40 UTC (rev 6) @@ -19,11 +19,11 @@ import org.jdom.Element; public class AdditionPointFactoryFactory implements - IDisplayElementFactoryFactory { + IMetaMetaModelElement { public AdditionPointFactory create(Element configuration, - Map<String, IDisplayElementFactoryFactory> factoryMap, - Map<String, IDisplayMapping> mappings) { + Map<String, IMetaMetaModelElement> factoryMap, + Map<String, IMetaModelElement> mappings) { Map<String, String> defaultValueMap = new HashMap<String, String>(); Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ApplyMappingsFactory.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ApplyMappingsFactory.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ApplyMappingsFactory.java 2006-05-16 20:28:40 UTC (rev 6) @@ -19,19 +19,19 @@ import org.jdom.JDOMException; import org.jdom.xpath.XPath; -public class ApplyMappingsFactory implements IDisplayMapping { +public class ApplyMappingsFactory implements IMetaModelElement { - private final Map<String, IDisplayMapping> mappingMap; + private final Map<String, IMetaModelElement> mappingMap; private final String selection; public ApplyMappingsFactory(String selection, - Map<String, IDisplayMapping> mappingMap) { + Map<String, IMetaModelElement> mappingMap) { this.selection = selection; this.mappingMap = mappingMap; } - public Area create(Element element, IDisplayModelElement parent) { + public Area create(Element element, IModelElement parent) { Area area = new Area(0); // use xpath Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ApplyMappingsFactoryFactory.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ApplyMappingsFactoryFactory.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ApplyMappingsFactoryFactory.java 2006-05-16 20:28:40 UTC (rev 6) @@ -17,11 +17,11 @@ import org.jdom.Element; public class ApplyMappingsFactoryFactory implements - IDisplayElementFactoryFactory { + IMetaMetaModelElement { public ApplyMappingsFactory create(Element configuration, - Map<String, IDisplayElementFactoryFactory> factoryMap, - Map<String, IDisplayMapping> mappings) { + Map<String, IMetaMetaModelElement> factoryMap, + Map<String, IMetaModelElement> mappings) { return new ApplyMappingsFactory( configuration.getAttributeValue("select"), mappings); Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Area.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Area.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Area.java 2006-05-16 20:28:40 UTC (rev 6) @@ -15,37 +15,37 @@ import java.util.ArrayList; import java.util.List; -public class Area implements IDisplayModelElement { +public class Area implements IModelElement { - private List<IDisplayModelElement> children = new ArrayList<IDisplayModelElement>(); + private List<IModelElement> children = new ArrayList<IModelElement>(); private final int indent; - public Area(int indent, IDisplayModelElement... children) { + public Area(int indent, IModelElement... children) { assert indent >= 0; this.indent = indent; - for (IDisplayModelElement element : children) { + for (IModelElement element : children) { add(element); } } - public void add(IDisplayModelElement element) { + public void add(IModelElement element) { this.children.add(element); } - public void accept(IDisplayModelElementVisitor visitor) { + public void accept(IModelElementVisitor visitor) { visitor.areaStart(this); - for (IDisplayModelElement child : children) { + for (IModelElement child : children) { child.accept(visitor); } visitor.areaEnd(this); } - public void insertBefore(AdditionPoint point, IDisplayModelElement element) { + public void insertBefore(AdditionPoint point, IModelElement element) { children.add(children.indexOf(point), element); } Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AreaFactory.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AreaFactory.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AreaFactory.java 2006-05-16 20:28:40 UTC (rev 6) @@ -17,9 +17,9 @@ import org.jdom.Element; -public class AreaFactory implements IDisplayMapping { +public class AreaFactory implements IMetaModelElement { - private final List<IDisplayMapping> childFactories = new ArrayList<IDisplayMapping>(); + private final List<IMetaModelElement> childFactories = new ArrayList<IMetaModelElement>(); private int indent; @@ -27,14 +27,14 @@ this.indent = indent; } - public void addChildFactory(IDisplayMapping mapping) { + public void addChildFactory(IMetaModelElement mapping) { childFactories.add(mapping); } - public Area create(Element element, IDisplayModelElement parent) { + public Area create(Element element, IModelElement parent) { Area result = new Area(indent); - for (IDisplayMapping mapping : childFactories) { + for (IMetaModelElement mapping : childFactories) { result.add(mapping.create(element, result)); } Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AreaFactoryFactory.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AreaFactoryFactory.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/AreaFactoryFactory.java 2006-05-16 20:28:40 UTC (rev 6) @@ -17,11 +17,11 @@ import org.jdom.Element; -public class AreaFactoryFactory implements IDisplayElementFactoryFactory { +public class AreaFactoryFactory implements IMetaMetaModelElement { public AreaFactory create(Element configuration, - Map<String, IDisplayElementFactoryFactory> factoryMap, - Map<String, IDisplayMapping> mappings) { + Map<String, IMetaMetaModelElement> factoryMap, + Map<String, IMetaModelElement> mappings) { AreaFactory areaFactory = new AreaFactory(Integer .parseInt(configuration.getAttributeValue("indent"))); Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/DisplayVisitor.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/DisplayVisitor.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/DisplayVisitor.java 2006-05-16 20:28:40 UTC (rev 6) @@ -21,7 +21,7 @@ import org.eclipse.swt.graphics.TextLayout; import org.eclipse.swt.widgets.Caret; -public final class DisplayVisitor implements IDisplayModelElementVisitor { +public final class DisplayVisitor implements IModelElementVisitor { private final TextLayout layout; Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/FixedLiteral.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/FixedLiteral.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/FixedLiteral.java 2006-05-16 20:28:40 UTC (rev 6) @@ -22,7 +22,7 @@ this.value = value; } - public void accept(IDisplayModelElementVisitor visitor) { + public void accept(IModelElementVisitor visitor) { visitor.visit(this); } Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/FixedLiteralFactory.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/FixedLiteralFactory.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/FixedLiteralFactory.java 2006-05-16 20:28:40 UTC (rev 6) @@ -14,7 +14,7 @@ import org.jdom.Element; -public class FixedLiteralFactory implements IDisplayMapping { +public class FixedLiteralFactory implements IMetaModelElement { private final String literal; @@ -24,7 +24,7 @@ this.literal = literal; } - public IDisplayModelElement create(Element element, IDisplayModelElement parent) { + public IModelElement create(Element element, IModelElement parent) { return new FixedLiteral(literal); } Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/FixedLiteralFactoryFactory.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/FixedLiteralFactoryFactory.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/FixedLiteralFactoryFactory.java 2006-05-16 20:28:40 UTC (rev 6) @@ -16,11 +16,11 @@ import org.jdom.Element; -public class FixedLiteralFactoryFactory implements IDisplayElementFactoryFactory { +public class FixedLiteralFactoryFactory implements IMetaMetaModelElement { public FixedLiteralFactory create(Element configuration, - Map<String, IDisplayElementFactoryFactory> factoryMap, - Map<String, IDisplayMapping> mappings) { + Map<String, IMetaMetaModelElement> factoryMap, + Map<String, IMetaModelElement> mappings) { return new FixedLiteralFactory(configuration.getText()); } Deleted: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayElementFactoryFactory.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayElementFactoryFactory.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayElementFactoryFactory.java 2006-05-16 20:28:40 UTC (rev 6) @@ -1,25 +0,0 @@ -/* $HeadURL$ - * ----------------------------------------------------------------------------- - * - * Copyright (C) Lars Grammel and others. - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Common Public License v1.0 which accompanies - * this distribution, and is available at - * - * http://www.eclipse.org/legal/cpl-v10.html - * - */ -package net.sourceforge.exmmt; - -import java.util.Map; - -import org.jdom.Element; - -public interface IDisplayElementFactoryFactory { - - IDisplayMapping create(Element configuration, - Map<String, IDisplayElementFactoryFactory> factoryMap, - Map<String, IDisplayMapping> mappings); - -} Deleted: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayMapping.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayMapping.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayMapping.java 2006-05-16 20:28:40 UTC (rev 6) @@ -1,21 +0,0 @@ -/* $RCSfile$ - * ----------------------------------------------------------------------------- - * - * Copyright (C) Lars Grammel and others. - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Common Public License v1.0 which accompanies - * this distribution, and is available at - * - * http://www.eclipse.org/legal/cpl-v10.html - * - */ -package net.sourceforge.exmmt; - -import org.jdom.Element; - -public interface IDisplayMapping { - - IDisplayModelElement create(Element element, IDisplayModelElement parent); - -} Deleted: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayModelElement.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayModelElement.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayModelElement.java 2006-05-16 20:28:40 UTC (rev 6) @@ -1,19 +0,0 @@ -/* $HeadURL$ - * ----------------------------------------------------------------------------- - * - * Copyright (C) Lars Grammel and others. - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Common Public License v1.0 which accompanies - * this distribution, and is available at - * - * http://www.eclipse.org/legal/cpl-v10.html - * - */ -package net.sourceforge.exmmt; - -public interface IDisplayModelElement { - - void accept(IDisplayModelElementVisitor visitor); - -} Deleted: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayModelElementVisitor.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayModelElementVisitor.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayModelElementVisitor.java 2006-05-16 20:28:40 UTC (rev 6) @@ -1,31 +0,0 @@ -/* $HeadURL$ - * ----------------------------------------------------------------------------- - * - * Copyright (C) Lars Grammel and others. - * - * All rights reserved. This program and the accompanying materials are made - * available under the terms of the Common Public License v1.0 which accompanies - * this distribution, and is available at - * - * http://www.eclipse.org/legal/cpl-v10.html - * - */ -package net.sourceforge.exmmt; - -public interface IDisplayModelElementVisitor { - - void visit(FixedLiteral literal); - - void visit(VariableLiteral literal); - - void lineStart(Line line); - - void lineEnd(Line line); - - void areaStart(Area area); - - void areaEnd(Area area); - - void visit(AdditionPoint point); - -} Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IFocusChecker.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IFocusChecker.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IFocusChecker.java 2006-05-16 20:28:40 UTC (rev 6) @@ -14,6 +14,6 @@ public interface IFocusChecker { - boolean hasFocus(IDisplayModelElement point); + boolean hasFocus(IModelElement point); } Copied: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IMetaMetaModelElement.java (from rev 5, net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayElementFactoryFactory.java) =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IMetaMetaModelElement.java (rev 0) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IMetaMetaModelElement.java 2006-05-16 20:28:40 UTC (rev 6) @@ -0,0 +1,25 @@ +/* $HeadURL$ + * ----------------------------------------------------------------------------- + * + * Copyright (C) Lars Grammel and others. + * + * All rights reserved. This program and the accompanying materials are made + * available under the terms of the Common Public License v1.0 which accompanies + * this distribution, and is available at + * + * http://www.eclipse.org/legal/cpl-v10.html + * + */ +package net.sourceforge.exmmt; + +import java.util.Map; + +import org.jdom.Element; + +public interface IMetaMetaModelElement { + + IMetaModelElement create(Element configuration, + Map<String, IMetaMetaModelElement> metaMetaModelMap, + Map<String, IMetaModelElement> metaModelMap); + +} Copied: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IMetaModelElement.java (from rev 5, net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayMapping.java) =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IMetaModelElement.java (rev 0) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IMetaModelElement.java 2006-05-16 20:28:40 UTC (rev 6) @@ -0,0 +1,21 @@ +/* $RCSfile$ + * ----------------------------------------------------------------------------- + * + * Copyright (C) Lars Grammel and others. + * + * All rights reserved. This program and the accompanying materials are made + * available under the terms of the Common Public License v1.0 which accompanies + * this distribution, and is available at + * + * http://www.eclipse.org/legal/cpl-v10.html + * + */ +package net.sourceforge.exmmt; + +import org.jdom.Element; + +public interface IMetaModelElement { + + IModelElement create(Element element, IModelElement parent); + +} Copied: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IModelElement.java (from rev 5, net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayModelElement.java) =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IModelElement.java (rev 0) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IModelElement.java 2006-05-16 20:28:40 UTC (rev 6) @@ -0,0 +1,19 @@ +/* $HeadURL$ + * ----------------------------------------------------------------------------- + * + * Copyright (C) Lars Grammel and others. + * + * All rights reserved. This program and the accompanying materials are made + * available under the terms of the Common Public License v1.0 which accompanies + * this distribution, and is available at + * + * http://www.eclipse.org/legal/cpl-v10.html + * + */ +package net.sourceforge.exmmt; + +public interface IModelElement { + + void accept(IModelElementVisitor visitor); + +} Copied: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IModelElementVisitor.java (from rev 5, net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IDisplayModelElementVisitor.java) =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IModelElementVisitor.java (rev 0) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IModelElementVisitor.java 2006-05-16 20:28:40 UTC (rev 6) @@ -0,0 +1,31 @@ +/* $HeadURL$ + * ----------------------------------------------------------------------------- + * + * Copyright (C) Lars Grammel and others. + * + * All rights reserved. This program and the accompanying materials are made + * available under the terms of the Common Public License v1.0 which accompanies + * this distribution, and is available at + * + * http://www.eclipse.org/legal/cpl-v10.html + * + */ +package net.sourceforge.exmmt; + +public interface IModelElementVisitor { + + void visit(FixedLiteral literal); + + void visit(VariableLiteral literal); + + void lineStart(Line line); + + void lineEnd(Line line); + + void areaStart(Area area); + + void areaEnd(Area area); + + void visit(AdditionPoint point); + +} Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Line.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Line.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Line.java 2006-05-16 20:28:40 UTC (rev 6) @@ -15,26 +15,26 @@ import java.util.ArrayList; import java.util.List; -public class Line implements IDisplayModelElement { +public class Line implements IModelElement { - private List<IDisplayModelElement> children = new ArrayList<IDisplayModelElement>(); + private List<IModelElement> children = new ArrayList<IModelElement>(); - public Line(IDisplayModelElement... children) { + public Line(IModelElement... children) { assert children != null; - for (IDisplayModelElement element : children) { + for (IModelElement element : children) { add(element); } } - public void add(IDisplayModelElement element) { + public void add(IModelElement element) { this.children.add(element); } - public void accept(IDisplayModelElementVisitor visitor) { + public void accept(IModelElementVisitor visitor) { visitor.lineStart(this); - for (IDisplayModelElement child : children) { + for (IModelElement child : children) { child.accept(visitor); } Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/LineFactory.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/LineFactory.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/LineFactory.java 2006-05-16 20:28:40 UTC (rev 6) @@ -17,18 +17,18 @@ import org.jdom.Element; -public class LineFactory implements IDisplayMapping { +public class LineFactory implements IMetaModelElement { - private final List<IDisplayMapping> childFactories = new ArrayList<IDisplayMapping>(); + private final List<IMetaModelElement> childFactories = new ArrayList<IMetaModelElement>(); - public void addChildFactory(IDisplayMapping mapping) { + public void addChildFactory(IMetaModelElement mapping) { childFactories.add(mapping); } - public Line create(Element element, IDisplayModelElement parent) { + public Line create(Element element, IModelElement parent) { Line line = new Line(); - for (IDisplayMapping mapping : childFactories) { + for (IMetaModelElement mapping : childFactories) { line.add(mapping.create(element, line)); } Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/LineFactoryFactory.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/LineFactoryFactory.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/LineFactoryFactory.java 2006-05-16 20:28:40 UTC (rev 6) @@ -17,11 +17,11 @@ import org.jdom.Element; -public class LineFactoryFactory implements IDisplayElementFactoryFactory { +public class LineFactoryFactory implements IMetaMetaModelElement { public LineFactory create(Element configuration, - Map<String, IDisplayElementFactoryFactory> factoryMap, - Map<String, IDisplayMapping> mappings) { + Map<String, IMetaMetaModelElement> factoryMap, + Map<String, IMetaModelElement> mappings) { LineFactory lineFactory = new LineFactory(); Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Literal.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Literal.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Literal.java 2006-05-16 20:28:40 UTC (rev 6) @@ -14,7 +14,7 @@ import org.eclipse.swt.graphics.Rectangle; -public abstract class Literal implements IDisplayModelElement { +public abstract class Literal implements IModelElement { public abstract String getValue(); Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ModelEditor.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ModelEditor.java 2006-05-15 12:52:54 UTC (rev 5) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ModelEditor.java 2006-05-16 20:28:40 UTC (rev 6) @@ -40,292 +40,292 @@ public class ModelEditor extends EditorPart { - final static boolean IS_CARBON, IS_GTK, IS_MOTIF; + final static boolean IS_CARBON, IS_GTK, IS_MOTIF; - private static final String SPACE = " "; + // TODO move / change + static { + String platform = SWT.getPlatform(); + IS_CARBON = "carbon".equals(platform); + IS_GTK = "... [truncated message content] |
|
From: <lgr...@us...> - 2006-05-17 12:44:50
|
Revision: 11 Author: lgrammel Date: 2006-05-17 05:44:38 -0700 (Wed, 17 May 2006) ViewCVS: http://svn.sourceforge.net/exmmt/?rev=11&view=rev Log Message: ----------- #1490215 license stuff Modified Paths: -------------- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Area.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/DisplayVisitor.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IMetaModelElement.java net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ModelText.java Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Area.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Area.java 2006-05-17 12:38:56 UTC (rev 10) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/Area.java 2006-05-17 12:44:38 UTC (rev 11) @@ -1,4 +1,4 @@ -/* $RCSfile$ +/* $HeadURL$ * ----------------------------------------------------------------------------- * * Copyright (C) Lars Grammel and others. Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/DisplayVisitor.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/DisplayVisitor.java 2006-05-17 12:38:56 UTC (rev 10) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/DisplayVisitor.java 2006-05-17 12:44:38 UTC (rev 11) @@ -1,4 +1,4 @@ -/* $RCSfile$ +/* $HeadURL$ * ----------------------------------------------------------------------------- * * Copyright (C) Lars Grammel and others. Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IMetaModelElement.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IMetaModelElement.java 2006-05-17 12:38:56 UTC (rev 10) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/IMetaModelElement.java 2006-05-17 12:44:38 UTC (rev 11) @@ -1,4 +1,4 @@ -/* $RCSfile$ +/* $HeadURL$ * ----------------------------------------------------------------------------- * * Copyright (C) Lars Grammel and others. Modified: net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ModelText.java =================================================================== --- net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ModelText.java 2006-05-17 12:38:56 UTC (rev 10) +++ net.sourceforge.exmmt/src/java/net/sourceforge/exmmt/ModelText.java 2006-05-17 12:44:38 UTC (rev 11) @@ -1,4 +1,4 @@ -/* $RCSfile$ +/* $HeadURL$ * ----------------------------------------------------------------------------- * * Copyright (C) Lars Grammel and others. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Thanks for helping keep SourceForge clean.
X