Upgrade to 0.8.0 per https://dev.eclipse.org/ipzilla/show_bug.cgi?id=3634.
diff --git a/org.ascape/plugins/org.ascape.ui.amp/META-INF/MANIFEST.MF b/org.ascape/plugins/org.ascape.ui.amp/META-INF/MANIFEST.MF
index 0cc8105..2b3cafe 100644
--- a/org.ascape/plugins/org.ascape.ui.amp/META-INF/MANIFEST.MF
+++ b/org.ascape/plugins/org.ascape.ui.amp/META-INF/MANIFEST.MF
@@ -3,26 +3,15 @@
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.ascape.ui.amp;singleton:=true
-Bundle-Version: 0.7.0.qualifier
+Bundle-Version: 0.8.0.qualifier
Bundle-Activator: org.ascape.AscapeRuntimePlugin
Require-Bundle: org.eclipse.core.resources;bundle-version="3.4.0";visibility:=reexport,
org.eclipse.core.runtime;visibility:=reexport,
- org.eclipse.draw2d;bundle-version="3.4.0",
- org.eclipse.jface;bundle-version="3.5.0";visibility:=reexport,
- org.eclipse.ui;bundle-version="3.5.0",
- org.eclipse.ui.views;bundle-version="3.3.0";visibility:=reexport,
- org.eclipse.gef;bundle-version="3.4.0";visibility:=reexport,
- org.eclipse.zest.core;resolution:=optional;visibility:=reexport,
- org.eclipse.zest.layouts;resolution:=optional;visibility:=reexport,
+ org.eclipse.ui;bundle-version="3.5.1",
org.ascape.core;bundle-version="5.2.0";visibility:=reexport,
- org.eclipse.amp.axf.core;visibility:=reexport,
- org.eclipse.amp.axf.views;visibility:=reexport,
- org.eclipse.amp.axf.ide;visibility:=reexport,
- org.eclipse.amp.agf.core;visibility:=reexport,
- org.eclipse.amp.agf.chart;bundle-version="0.2.0";visibility:=reexport,
- org.eclipse.amp.escape.ascape;bundle-version="0.2.0",
- org.eclipse.amp.escape.ascape.chart;bundle-version="0.2.0",
- org.eclipse.birt.chart.engine
+ org.eclipse.amp.axf.views;bundle-version="0.5.0",
+ org.eclipse.amp.agf.core;bundle-version="0.5.0",
+ org.eclipse.amp.escape.ascape;bundle-version="0.5.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.ascape,
diff --git a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/util/vis/ColorFeatureConcrete.java b/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/util/vis/ColorFeatureConcrete.java
index 2d17c5a..b94d309 100644
--- a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/util/vis/ColorFeatureConcrete.java
+++ b/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/util/vis/ColorFeatureConcrete.java
@@ -13,7 +13,6 @@
import org.ascape.model.AscapeObject;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
/**
* A Color feature returns a color based on the state of an object of known type provided to it.
@@ -83,8 +82,8 @@
public static Color adjustBrightness(Color color, float factor) {
// TODO Cache generated values
float[] agentHSB = color.getRGB().getHSB();
- float newBright = Math.min(1.0f, agentHSB[1] * factor);
- Color brighter = new Color(Display.getCurrent(), new RGB(agentHSB[0], newBright, agentHSB[2]));
+ float newBright = Math.min(1.0f, agentHSB[2] * factor);
+ Color brighter = createHSB(agentHSB[0], agentHSB[1], newBright);
return brighter;
}
diff --git a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/AgentView.java b/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/AgentView.java
index 0901bc4..ef360a0 100644
--- a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/AgentView.java
+++ b/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/AgentView.java
@@ -16,11 +16,13 @@
import org.ascape.model.LocatedAgent;
import org.ascape.util.VectorSelection;
import org.ascape.util.vis.ColorFeature;
+import org.ascape.util.vis.ColorFeatureConcrete;
import org.ascape.util.vis.DrawFeature;
import org.ascape.util.vis.DrawFeatureSelection;
import org.ascape.util.vis.IDrawSelection;
import org.eclipse.draw2d.Graphics;
import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.swt.graphics.Color;
@@ -58,6 +60,11 @@
private DrawFeatureObservable drawFeatureObservable = new DrawFeatureObservable();
/**
+ * The generic color feature used to set the color for the primary agent type.
+ */
+ protected ColorFeature agentColorFeature;
+
+ /**
* Instantiates a new agent view.
*/
public AgentView() {
@@ -86,6 +93,18 @@
return drawFeatureObservable;
}
+ public void createFeatures() {
+ if (agentColorFeature == null) {
+ agentColorFeature = new ColorFeatureConcrete("Default Agent Color") {
+ private static final long serialVersionUID = -3220486698290440285L;
+
+ public Color getColor(Object object) {
+ return (Color) ((Agent) object).getPlatformColor();
+ }
+ };
+ }
+ }
+
/**
* Adds the provided draw feature to this scape.
*
diff --git a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/ChartView.java b/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/ChartView.java
deleted file mode 100644
index 5fa7848..0000000
--- a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/ChartView.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.ascape.view.vis;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.ascape.util.data.DataSelection;
-import org.eclipse.amp.agf.chart.CachedColorProvider;
-import org.eclipse.amp.agf.chart.ChartEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.ui.IViewPart;
-
-public class ChartView extends EditPartScapeView {
-
- private static final long serialVersionUID = 1L;
- private ChartEditPart chartPart;
- private Collection<String> seriesCache = new HashSet<String>();
- CachedColorProvider seriesColorProvider = new CachedColorProvider();
-
- public ChartView() {
- super("org.eclipse.amp.view.ChartView", null, "Chart View");
- }
-
- public EditPart createEditPart(EditPart context, Object model) {
- chartPart = new ChartEditPart() {
- @Override
- public Object getAdapter(Class key) {
- if (key == IViewPart.class) {
- return getViewPart();
- }
- return ChartView.super.getAdapter(key);
- }
- };
- chartPart.setSeriesColorProvider(seriesColorProvider);
-
- chartPart.setModel(model);
- synchCache(model);
- return chartPart;
- }
-
- private void synchCache(Object model) {
- DataSelection dataSelection = (DataSelection) chartPart.getDataProvider().getDataSource(model);
- for (String series : seriesCache) {
- dataSelection.setSelected(series, true);
- }
- }
-
- /**
- * Adds a series to the chart being viewed. Convenience method (could also get view model and set select group.)
- *
- * @param valueName
- * the name of the series to add
- */
- public void addSeries(String valueName) {
- seriesCache.add(valueName);
- if (chartPart != null) {
- synchCache(chartPart.getModel());
- }
- }
-
- /**
- * Adds a series to the chart being viewed. Convenience method.
- *
- * @param valueName
- * the name of the series to add
- * @param color
- * the color to use for the series in the chart
- */
- public void addSeries(String valueName, Color color) {
- seriesColorProvider.putForegroundColor(valueName, color);
- addSeries(valueName);
- }
-}
diff --git a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/EditPartFactoryScapeView.java b/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/EditPartFactoryScapeView.java
deleted file mode 100644
index 7cf4101..0000000
--- a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/EditPartFactoryScapeView.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.ascape.view.vis;
-
-import org.eclipse.amp.agf.gef.ModelEditPartInput;
-import org.eclipse.amp.axf.view.ModelInput;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.RootEditPart;
-
-public abstract class EditPartFactoryScapeView extends ModelScapeView {
- private static final long serialVersionUID = 1L;
- private RootEditPart rootPart;
-
- public EditPartFactoryScapeView(String primaryID, String secondaryID, String name) {
- super(primaryID, secondaryID, name);
- }
-
- public ModelInput createInput() {
- ModelInput editorInput = new ModelEditPartInput(getModel(), null);
- return editorInput;
- }
-
- public Object getAdapter(Class key) {
- if (key == EditPart.class) {
- return rootPart.getChildren().get(0);
- }
- return super.getAdapter(key);
- }
-}
diff --git a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/EditPartScapeView.java b/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/EditPartScapeView.java
deleted file mode 100644
index 0c83435..0000000
--- a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/EditPartScapeView.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.ascape.view.vis;
-
-import org.eclipse.amp.agf.gef.ModelEditPartInput;
-import org.eclipse.amp.axf.view.ModelInput;
-import org.eclipse.gef.EditPartFactory;
-
-public abstract class EditPartScapeView extends EditPartFactoryScapeView implements EditPartFactory {
-
- private static final long serialVersionUID = 1L;
-
- public EditPartScapeView(String primaryID, String secondaryID, String name) {
- super(primaryID, secondaryID, name);
- }
-
- public ModelInput createInput() {
- ModelInput editorInput = new ModelEditPartInput(getModel(), this);
- return editorInput;
- }
-}
\ No newline at end of file
diff --git a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/GEFView.java b/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/GEFView.java
deleted file mode 100644
index d2a3e68..0000000
--- a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/GEFView.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.ascape.view.vis;
-
-
-
-public class GEFView extends EditPartFactoryScapeView {
-
- private static final long serialVersionUID = 1L;
-
- public GEFView(String primaryID, String secondaryID, String name) {
- super(primaryID, secondaryID, name);
- }
-
- public GEFView() {
- super("org.eclipse.amp.view.GEFView", null, "Graphic View");
- }
-
- public GEFView(String name) {
- super("org.eclipse.amp.view.GEFView", null, name);
- }
-}
diff --git a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/GraphicsEditPart.java b/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/GraphicsEditPart.java
deleted file mode 100644
index 4c8c524..0000000
--- a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/GraphicsEditPart.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * <copyright>
- *
- * Copyright (c) 2009 Metascape, LLC.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Metascape - Initial API and Implementation
- *
- * </copyright>
- *
- */
-
-package org.ascape.view.vis;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.ui.IViewPart;
-
-class GraphicsEditPart extends AbstractGraphicalEditPart {
-
- private final GraphicsView graphicsView;
-
- /**
- * @param graphicsView
- * @param model
- */
- GraphicsEditPart(GraphicsView graphicsView, Object model) {
- this.graphicsView = graphicsView;
- setModel(model);
- }
-
- protected IFigure createFigure() {
- graphicsView.createImageFigure();
- return graphicsView.getImageFigure();
- }
-
- protected void createEditPolicies() {
- }
-
- public void refresh() {
- graphicsView.refresh();
- }
-
- public void setModel(Object model) {
- super.setModel(model);
- graphicsView.createFeatures();
- }
-
- @Override
- public Object getAdapter(Class key) {
- if (key == IViewPart.class) {
- return graphicsView.getViewPart();
- }
- return super.getAdapter(key);
- }
-}
\ No newline at end of file
diff --git a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/GraphicsView.java b/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/GraphicsView.java
deleted file mode 100644
index 0500c44..0000000
--- a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/GraphicsView.java
+++ /dev/null
@@ -1,171 +0,0 @@
-
-package org.ascape.view.vis;
-
-import java.util.TooManyListenersException;
-
-import org.ascape.model.Agent;
-import org.ascape.model.event.ScapeEvent;
-import org.ascape.util.vis.ColorFeature;
-import org.ascape.util.vis.ColorFeatureConcrete;
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureListener;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-
-
-
-public class GraphicsView extends EditPartScapeView {
-
- private static final long serialVersionUID = 1L;
-
- public GraphicsView(String name) {
- super("org.eclipse.amp.escape.view.GraphicsView", null, name);
- }
-
- /**
- * The generic color feature used to set the color for the primary agent type.
- */
- protected ColorFeature agentColorFeature;
-
- // public Transform createTR(Graphics graphics) {
- // Transform transform = new Transform(Device.getDevice());
- // graphics.setTransform(transform);
- // return transform;
- // }
-
- protected void updateScapeGraphics(Graphics graphics) {
- }
-
- public EditPart createEditPart(EditPart context, Object model) {
- return new GraphicsEditPart(this, model);
- }
-
- protected Image image;
-
- IFigure imageFigure;
-
- /**
- * Size of each individual cell, typically in pixels. 6 by default.
- */
- protected int agentSize = 20;
-
- protected GC imageGC;
-
- Graphics imageGraphics;
-
- public void createImageFigure() {
- imageFigure = new Figure() {
- public void paintFigure(Graphics graphics) {
- synchronized (this) {
- if (image != null && !image.isDisposed()) {
- graphics.drawImage(image, 0, 0);
- }
- }
- }
- };
-
- imageFigure.setLayoutManager(new AbstractLayout() {
- public Dimension getMinimumSize(IFigure container, int hintWidth, int hintHeight) {
- if (getScape() != null) {
- return getMinimumSizeWithin(new Dimension(hintWidth, hintHeight));
- }
- return new Dimension(500, 500);
- }
-
- protected Dimension calculatePreferredSize(IFigure container, int hintWidth, int hintHeight) {
- if (getScape() != null) {
- return getPreferredSizeWithin(new Dimension(hintWidth, hintHeight));
- } else {
- return new Dimension(500, 500);
- }
- }
-
- public void layout(IFigure container) {
- imageFigure.setLocation(new Point(0, 0));
- }
- });
- imageFigure.addFigureListener(new FigureListener() {
- public void figureMoved(IFigure source) {
- refresh();
- }
- });
- }
-
- public void createImage() {
- Dimension size = getPreferredSizeWithin(imageFigure.getSize());
- if (size.width <= 0 || size.height <= 0) {
- size = new Dimension(1, 1);
- }
- if (image == null || image.getBounds().width != size.width || image.getBounds().height != size.height) {
- if (image != null) {
- // Need to release prior resources..
- if (!image.isDisposed()) {
- image.dispose();
- imageGC.dispose();
- imageGraphics.dispose();
- }
- }
- // System.out.println("New: " + imageFigure.getSize());
- // System.out.println("OPld:" + image.getBounds());
- image = new Image(Display.getCurrent(), new org.eclipse.swt.graphics.Rectangle(0, 0, size.width,
- size.height));
- imageGC = new GC(image);
- imageGraphics = new SWTGraphics(imageGC);
- }
- }
-
- public void refresh() {
- createImage();
- updateScapeGraphics(imageGraphics);
- imageFigure.repaint();
- }
-
- public void createFeatures() {
- if (agentColorFeature == null) {
- agentColorFeature = new ColorFeatureConcrete("Default Agent Color") {
- private static final long serialVersionUID = -3220486698290440285L;
-
- public Color getColor(Object object) {
- return (Color) ((Agent) object).getPlatformColor();
- }
- };
- }
- }
-
- public void scapeAdded(ScapeEvent scapeEvent) throws TooManyListenersException {
- super.scapeAdded(scapeEvent);
- createFeatures();
- }
-
- public Dimension getSize() {
- return new Dimension(image.getBounds().width, image.getBounds().height);
- }
-
- public Dimension getPreferredSizeWithin(Dimension d) {
- return new Dimension(d.width < 1 ? 500 : d.width, d.height < 1 ? 500 : d.height);
- }
-
- public Dimension getMinimumSizeWithin(Dimension d) {
- return new Dimension(1, 1);
- }
-
- public Image getImage() {
- return image;
- }
-
- /**
- * @return the imageFigure
- */
- public IFigure getImageFigure() {
- return imageFigure;
- }
-}
\ No newline at end of file
diff --git a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/ModelScapeView.java b/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/ModelScapeView.java
deleted file mode 100644
index 4d8f44c..0000000
--- a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/ModelScapeView.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.ascape.view.vis;
-
-import java.util.TooManyListenersException;
-
-import org.ascape.model.event.DefaultScapeListener;
-import org.ascape.model.event.ScapeEvent;
-import org.eclipse.amp.axf.core.IModel;
-import org.eclipse.amp.axf.core.IObservationProvider;
-import org.eclipse.amp.axf.ide.AXFWorkbenchPlugin;
-import org.eclipse.amp.axf.view.ModelInput;
-import org.eclipse.amp.axf.view.ModelViewPart;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.ui.IViewPart;
-
-public abstract class ModelScapeView extends DefaultScapeListener implements IAdaptable {
-
- private static final long serialVersionUID = -2831280332433751678L;
-
- private String name;
-
- private String primaryID;
- private String secondaryID;
- private ModelViewPart modelViewPart;
-
- private IModel model;
-
- public ModelScapeView(String primaryID, String secondaryID, String name) {
- super();
- this.primaryID = primaryID;
- this.secondaryID = secondaryID;
- this.name = name;
- if (name == null) {
- this.name = primaryID + (secondaryID != null ? ":" + secondaryID : "");
- }
- }
-
- public ModelScapeView(String primaryID) {
- this(primaryID, null, null);
- }
-
- public Object getAdapter(Class key) {
- if (key == IModel.class) {
- IObservationProvider model = (IObservationProvider) AXFWorkbenchPlugin.getDefault().getManager()
- .getAdapter(getScape().getRoot(), IModel.class);
- return model;
- }
- if (key == IViewPart.class) {
- return modelViewPart;
- }
- return null;
- }
-
- public ModelInput createInput() {
- return new ModelInput(getModel());
- }
-
- public void scapeAdded(ScapeEvent scapeEvent) throws TooManyListenersException {
- super.scapeAdded(scapeEvent);
- model = (IModel) AXFWorkbenchPlugin.getDefault().getManager().getAdapter(getScape().getRoot(), IModel.class);
- AXFWorkbenchPlugin.getDefault().getManager().createViewPart(primaryID, createInput(), name);
- }
-
- public IModel getModel() {
- return model;
- }
-
- public String getName() {
- return name;
- }
-
- public String toString() {
- return getName() + " View";
- }
-
- public IViewPart getViewPart() {
- return modelViewPart;
- }
-}
diff --git a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/TreeView.java b/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/TreeView.java
deleted file mode 100644
index ee53190..0000000
--- a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/TreeView.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.ascape.view.vis;
-
-import org.eclipse.amp.axf.core.IModel;
-import org.eclipse.amp.axf.core.IObservationProvider;
-import org.eclipse.amp.axf.ide.AXFWorkbenchPlugin;
-import org.eclipse.ui.IViewPart;
-
-
-public class TreeView extends EditPartFactoryScapeView {
- private static final long serialVersionUID = 1L;
-
- public TreeView() {
- super("org.eclipse.amp.view.TreeView", null, "Tree View");
- }
-
- public Object getAdapter(Class key) {
- if (key == IModel.class) {
- IObservationProvider model = (IObservationProvider) AXFWorkbenchPlugin.getDefault().getManager().getAdapter(getScape().getRoot(), IModel.class);
- return model;
- }
- if (key == IViewPart.class) {
- return getViewPart();
- }
- return null;
- }
-}
diff --git a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/ZestView.java b/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/ZestView.java
deleted file mode 100644
index 3aac5c5..0000000
--- a/org.ascape/plugins/org.ascape.ui.amp/src/org/ascape/view/vis/ZestView.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.ascape.view.vis;
-
-
-public class ZestView extends ModelScapeView {
-
- private static final long serialVersionUID = 1L;
-
- public ZestView() {
- super("org.eclipse.amp.view.ZestView", null, null);
- }
-
- public ZestView(String name) {
- super("org.eclipse.amp.view.ZestView", null, name);
- }
-}