You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/03/19 17:38:37 UTC
[1/5] incubator-taverna-workbench git commit: Removed outdated modules
Repository: incubator-taverna-workbench
Updated Branches:
refs/heads/master 4357f05ec -> 4f8453f09
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeRenderer.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeRenderer.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeRenderer.java
deleted file mode 100644
index 12fd2a4..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeRenderer.java
+++ /dev/null
@@ -1,554 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition.ui;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Paint;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.Stroke;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.GeneralPath;
-
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JTree;
-import javax.swing.UIManager;
-import javax.swing.plaf.TreeUI;
-import javax.swing.tree.TreeCellRenderer;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreePath;
-
-public abstract class TableTreeNodeRenderer implements TreeCellRenderer {
-
- private static final long serialVersionUID = -7291631337751330696L;
-
- // The difference in indentation between a node and its child nodes, there
- // isn't an easy way to get this other than constructing a JTree and
- // measuring it - you'd think it would be a property of TreeUI but
- // apparently not.
- private static int perNodeOffset = -1;
-
- // Use this to rubber stamp the original node renderer in before rendering
- // the table
- private TreeCellRenderer nodeRenderer;
-
- // Determines the space allocated to leaf nodes and their parents when
- // applying the stamp defined by the nodeRenderer
- private int nodeWidth;
-
- // Number of pixels of space to leave between the node label and the table
- // header or rows
- private int labelToTablePad = 3;
-
- // Number of pixels to leave around the label rendered into the table cells
- private int cellPadding = 4;
-
- // Drawing borders?
- private boolean drawingBorders = true;
-
- // The number of pixels by which the height of the header is reduced
- // compared to the row height, this leaves a small border above the header
- // and separates it from the last row of the table above, if any.
- private int headerTopPad = 4;
-
- // The proportion of colour : black or colour : white used to create the
- // darker or lighter shades is blendFactor : 1
- private int blendFactor = 2;
-
- // Colour to use to draw the table borders when they're enabled
- private Color borderColour = Color.black;
-
- /**
- * Set the colour to be used to draw the borders if they are displayed at
- * all. Defaults to black.
- */
- public void setBorderColour(Color borderColour) {
- this.borderColour = borderColour;
- }
-
- /**
- * The blend factor determines how strong the colour component is in the
- * shadow and highlight colours used in the bevelled boxes, the ratio of
- * black / white to colour is 1 : blendFactor
- *
- * @param blendFactor
- */
- public void setBlendFactor(int blendFactor) {
- this.blendFactor = blendFactor;
- }
-
- /**
- * Set whether the renderer will draw borders around the table cells - if
- * this is false the table still has the bevelled edges of the cell painters
- * so will still look semi-bordered. Defaults to true if not otherwise set.
- *
- * @param drawingBorders
- */
- public void setDrawBorders(boolean drawingBorders) {
- this.drawingBorders = drawingBorders;
- }
-
- /**
- * Override and implement to get the list of columns for a given partition
- * node - currently assumes all partitions use the same column structure
- * which I need to fix so it doesn't take a partition as argument (yet).
- *
- * @return an array of column specifications used to drive the renderer
- */
- public abstract TableTreeNodeColumn[] getColumns();
-
- /**
- * Construct a new TableTreeNodeRenderer
- *
- * @param nodeRenderer
- * The inner renderer used to render the node labels
- * @param nodeWidth
- * Width of the cell space into which the node label is rendered
- * in the table header and row nodes
- */
- public TableTreeNodeRenderer(TreeCellRenderer nodeRenderer, int nodeWidth) {
- super();
- this.nodeRenderer = nodeRenderer;
- this.nodeWidth = nodeWidth;
- }
-
- /**
- * Do the magic!
- */
- public Component getTreeCellRendererComponent(final JTree tree,
- final Object value, final boolean selected, final boolean expanded,
- final boolean leaf, final int row, final boolean hasFocus) {
- final Component nodeLabel = nodeRenderer.getTreeCellRendererComponent(
- tree, value, false, expanded, leaf, row, false);
- final int nodeLabelHeight = (int) nodeLabel.getPreferredSize()
- .getHeight();
- if (leaf) {
- // Rendering the leaf nodes, therefore use the table rendering
- // strategy
- getPerNodeIndentation(tree, row);
- return new JComponent() {
- private static final long serialVersionUID = 4993815558563895266L;
-
- @Override
- public Dimension getPreferredSize() {
- int width = nodeWidth + labelToTablePad;
- for (TableTreeNodeColumn column : getColumns()) {
- width += column.getColumnWidth();
- }
- return new Dimension(width, nodeLabelHeight);
- }
-
- @Override
- protected void paintComponent(Graphics g) {
-
- Graphics2D g2d = (Graphics2D) g.create();
- AffineTransform originalTransform = g2d.getTransform();
- // Enable anti-aliasing for the curved lines
- g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
- RenderingHints.VALUE_ANTIALIAS_ON);
-
- // This method should paint a bevelled container for the
- // original label but it doesn't really work terribly well
- // as we can't ensure that the original label is actually
- // honouring any opaque flags.
- if (drawingBorders) {
- paintRectangleWithBevel(g2d, nodeWidth
- + labelToTablePad, getHeight(), Color.white);
- }
-
- // Paint original node label
- nodeLabel.setSize(new Dimension(
- nodeWidth - cellPadding * 2, getHeight()
- - (drawingBorders ? 2 : 1)));
- g2d.translate(cellPadding, 0);
- nodeLabel.paint(g2d);
- g2d.translate(-cellPadding, 0);
-
- if (drawingBorders) {
- paintRectangleBorder(g2d, nodeWidth + labelToTablePad,
- getHeight(), 0, 0, 1, 1, borderColour);
- }
-
- g2d.translate(nodeWidth + labelToTablePad, 0);
- boolean first = true;
- for (TableTreeNodeColumn column : getColumns()) {
-
- Color fillColour = column.getColour().brighter();
- Object parentNode = tree.getPathForRow(row)
- .getParentPath().getLastPathComponent();
- int indexInParent = tree.getModel().getIndexOfChild(
- parentNode, value);
- if ((indexInParent & 1) == 1) {
- fillColour = new Color(
- (fillColour.getRed() + column.getColour()
- .getRed()) / 2, (fillColour
- .getGreen() + column.getColour()
- .getGreen()) / 2, (fillColour
- .getBlue() + column.getColour()
- .getBlue()) / 2);
- }
-
- // Paint background and bevel
- paintRectangleWithBevel(g2d, column.getColumnWidth(),
- getHeight(), fillColour);
-
- // Paint cell component
- Component cellComponent = column.getCellRenderer(value);
- cellComponent.setSize(new Dimension(column
- .getColumnWidth()
- - cellPadding * 2, getHeight()));
- g2d.translate(cellPadding, 0);
- cellComponent.paint(g2d);
- g2d.translate(-cellPadding, 0);
-
- // Draw border
- if (drawingBorders) {
- paintRectangleBorder(g2d, column.getColumnWidth(),
- getHeight(), 0, 1, 1, first ? 1 : 0,
- borderColour);
- }
- first = false;
-
- g2d.translate(column.getColumnWidth(), 0);
-
- }
- if (selected) {
- g2d.setTransform(originalTransform);
- g2d.translate(2, 0);
- paintRectangleWithHighlightColour(g2d, getWidth()
- - (drawingBorders ? 4 : 2), getHeight()
- - (drawingBorders ? 2 : 0));
- }
- }
- };
- } else {
- // If there are no child nodes, or there are child nodes but they
- // aren't leaves then we render the cell as normal. If there are
- // child nodes and the first one is a leaf (we assume this means
- // they all are!) then we render the table header after the label.
- if (!expanded) {
- return getLabelWithHighlight(nodeLabel, selected);
- }
- // Expanded so do the model check...
- TreeModel model = tree.getModel();
- int childCount = model.getChildCount(value);
- if (childCount == 0) {
- return getLabelWithHighlight(nodeLabel, selected);
- }
- Object childNode = model.getChild(value, 0);
- if (!model.isLeaf(childNode)) {
- return getLabelWithHighlight(nodeLabel, selected);
- }
- getPerNodeIndentation(tree, row);
- // Got to here so we need to render a table header.
- return new JComponent() {
- private static final long serialVersionUID = -4923965850510357216L;
-
- @Override
- public Dimension getPreferredSize() {
- int width = nodeWidth + labelToTablePad + perNodeOffset;
- for (TableTreeNodeColumn column : getColumns()) {
- width += column.getColumnWidth();
- }
- return new Dimension(width, nodeLabelHeight);
- }
-
- @Override
- protected void paintComponent(Graphics g) {
-
- Graphics2D g2d = (Graphics2D) g.create();
- AffineTransform originalTransform = g2d.getTransform();
- // Enable anti-aliasing for the curved lines
- g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
- RenderingHints.VALUE_ANTIALIAS_ON);
-
- // Paint original node label
- nodeLabel.setSize(new Dimension(nodeWidth + perNodeOffset,
- getHeight()));
- nodeLabel.paint(g2d);
-
- // Draw line under label to act as line above table row
- // below
- if (drawingBorders) {
- GeneralPath path = new GeneralPath();
- path.moveTo(perNodeOffset, getHeight() - 1);
- path.lineTo(
- perNodeOffset + nodeWidth + labelToTablePad,
- getHeight() - 1);
- g2d.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT,
- BasicStroke.JOIN_MITER));
- g2d.setPaint(borderColour);
- g2d.draw(path);
- }
-
- // Move painting origin to the start of the header row
- g2d.translate(nodeWidth + perNodeOffset + labelToTablePad,
- 0);
-
- // Paint columns
- boolean first = true;
- for (TableTreeNodeColumn column : getColumns()) {
-
- // Paint header cell background with bevel
- g2d.translate(0, headerTopPad);
- paintRectangleWithBevel(g2d, column.getColumnWidth(),
- getHeight() - headerTopPad, column.getColour());
-
- // Paint header label
- JLabel columnLabel = new JLabel(column.getShortName());
- columnLabel.setSize(new Dimension(column
- .getColumnWidth()
- - cellPadding * 2, getHeight() - headerTopPad));
- g2d.translate(cellPadding, 0);
- columnLabel.paint(g2d);
- g2d.translate(-cellPadding, 0);
-
- // Paint header borders
- if (drawingBorders) {
- paintRectangleBorder(g2d, column.getColumnWidth(),
- getHeight() - headerTopPad, 1, 1, 1,
- first ? 1 : 0, borderColour);
- }
- g2d.translate(0, -headerTopPad);
- first = false;
- g2d.translate(column.getColumnWidth(), 0);
-
- }
- if (selected) {
- g2d.setTransform(originalTransform);
- g2d.translate(1, headerTopPad);
- paintRectangleWithHighlightColour(g2d, perNodeOffset
- + nodeWidth + labelToTablePad
- - (drawingBorders ? 2 : 0), getHeight()
- - (headerTopPad + 2));
- }
- }
- };
-
- }
-
- }
-
- private static Component getLabelWithHighlight(final Component c,
- boolean selected) {
- if (!selected) {
- return c;
- } else {
- return new JComponent() {
- private static final long serialVersionUID = -9175635475959046704L;
-
- @Override
- public Dimension getPreferredSize() {
- return c.getPreferredSize();
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- Graphics2D g2d = (Graphics2D) g.create();
- c.setSize(new Dimension(getWidth(), getHeight()));
- c.paint(g2d);
- g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
- RenderingHints.VALUE_ANTIALIAS_ON);
- g2d.translate(1, 1);
- paintRectangleWithHighlightColour(g2d, getWidth() - 2,
- getHeight() - 2);
- }
- };
- }
- }
-
- private static void paintRectangleBorder(Graphics2D g2d, int width,
- int height, int north, int east, int south, int west, Color c) {
- Paint oldPaint = g2d.getPaint();
- Stroke oldStroke = g2d.getStroke();
-
- g2d.setPaint(c);
-
- GeneralPath path;
-
- if (north > 0) {
- g2d.setStroke(new BasicStroke(north, BasicStroke.CAP_BUTT,
- BasicStroke.JOIN_MITER));
- path = new GeneralPath();
- path.moveTo(0, north - 1);
- path.lineTo(width - 1, north - 1);
- g2d.draw(path);
- }
- if (east > 0) {
- g2d.setStroke(new BasicStroke(east, BasicStroke.CAP_BUTT,
- BasicStroke.JOIN_MITER));
- path = new GeneralPath();
- path.moveTo(width - east, 0);
- path.lineTo(width - east, height - 1);
- g2d.draw(path);
- }
- if (south > 0) {
- g2d.setStroke(new BasicStroke(south, BasicStroke.CAP_BUTT,
- BasicStroke.JOIN_MITER));
- path = new GeneralPath();
- path.moveTo(0, height - south);
- path.lineTo(width - 1, height - south);
- g2d.draw(path);
- }
- if (west > 0) {
- g2d.setStroke(new BasicStroke(west, BasicStroke.CAP_BUTT,
- BasicStroke.JOIN_MITER));
- path = new GeneralPath();
- path.moveTo(west - 1, 0);
- path.lineTo(west - 1, height - 1);
- g2d.draw(path);
- }
-
- g2d.setPaint(oldPaint);
- g2d.setStroke(oldStroke);
- }
-
- /**
- * Paint a rectangle with the border colour set from the UIManager
- * 'textHighlight' property and filled with the same colour at alpha 50/255.
- * Paints from 0,0 to width-1,height-1 into the specified Graphics2D,
- * preserving the existing paint and stroke properties on exit.
- */
- private static void paintRectangleWithHighlightColour(Graphics2D g2d,
- int width, int height) {
- GeneralPath path = new GeneralPath();
- path.moveTo(0, 0);
- path.lineTo(width - 1, 0);
- path.lineTo(width - 1, height - 1);
- path.lineTo(0, height - 1);
- path.closePath();
-
- Paint oldPaint = g2d.getPaint();
- Stroke oldStroke = g2d.getStroke();
-
- Color c = UIManager.getColor("textHighlight");
-
- g2d.setStroke(new BasicStroke(2, BasicStroke.CAP_BUTT,
- BasicStroke.JOIN_MITER));
- g2d.setPaint(c);
- g2d.draw(path);
-
- Color alpha = new Color(c.getRed(), c.getGreen(), c.getBlue(), 50);
- g2d.setPaint(alpha);
- g2d.fill(path);
-
- g2d.setPaint(oldPaint);
- g2d.setStroke(oldStroke);
-
- }
-
- /**
- * Paint a bevelled rectangle into the specified Graphics2D with shape from
- * 0,0 to width-1,height-1 using the specified colour as a base and
- * preserving colour and stroke in the Graphics2D
- */
- private void paintRectangleWithBevel(Graphics2D g2d, int width, int height,
- Color c) {
- if (drawingBorders) {
- width = width - 1;
- height = height - 1;
- }
-
- GeneralPath path = new GeneralPath();
- path.moveTo(0, 0);
- path.lineTo(width - 1, 0);
- path.lineTo(width - 1, height - 1);
- path.lineTo(0, height - 1);
- path.closePath();
-
- Paint oldPaint = g2d.getPaint();
- Stroke oldStroke = g2d.getStroke();
-
- g2d.setPaint(c);
- g2d.fill(path);
-
- g2d.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT,
- BasicStroke.JOIN_MITER));
-
- // Draw highlight (Northeast)
- path = new GeneralPath();
- path.moveTo(0, 0);
- path.lineTo(width - 1, 0);
- path.lineTo(width - 1, height - 1);
- Color highlightColour = new Color((c.getRed() * blendFactor + 255)
- / (blendFactor + 1), (c.getGreen() * blendFactor + 255)
- / (blendFactor + 1), (c.getBlue() * blendFactor + 255)
- / (blendFactor + 1));
- g2d.setPaint(highlightColour);
- g2d.draw(path);
-
- // Draw shadow (Southwest)
- path = new GeneralPath();
- path.moveTo(0, 0);
- path.lineTo(0, height - 1);
- path.lineTo(width - 1, height - 1);
- Color shadowColour = new Color((c.getRed() * blendFactor)
- / (blendFactor + 1), (c.getGreen() * blendFactor)
- / (blendFactor + 1), (c.getBlue() * blendFactor)
- / (blendFactor + 1));
- g2d.setPaint(shadowColour);
- g2d.draw(path);
-
- g2d.setPaint(oldPaint);
- g2d.setStroke(oldStroke);
-
- }
-
- /**
- * The TreeUI which was used to determine the per node indentation in the
- * JTree for which this is a renderer. If this hasn't been set yet then this
- * is null.
- */
- private static TreeUI cachedTreeUI = null;
-
- /**
- * Use the current TreeUI to determine the indentation per-node in the tree,
- * this only works when the treeRow passed in is not the root as it has to
- * traverse up to the parent to do anything sensible. Cached and associated
- * with the TreeUI so in theory if the look and feel changes the UI changes
- * and this is re-generated within the renderer code.
- *
- * @param tree
- * @param treeRow
- * @return
- */
- private static int getPerNodeIndentation(JTree tree, int treeRow) {
- if (perNodeOffset > 0 && tree.getUI() == cachedTreeUI) {
- return perNodeOffset;
- }
- TreeUI uiModel = tree.getUI();
- cachedTreeUI = uiModel;
- TreePath path = tree.getPathForRow(treeRow);
- Rectangle nodeBounds = uiModel.getPathBounds(tree, path);
- Rectangle parentNodeBounds = uiModel.getPathBounds(tree, path
- .getParentPath());
- perNodeOffset = (int) nodeBounds.getMinX()
- - (int) parentNodeBounds.getMinX();
- return perNodeOffset;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/UITest.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/UITest.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/UITest.java
deleted file mode 100644
index 05a6112..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/UITest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition.ui;
-
-import java.awt.BorderLayout;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-
-import net.sf.taverna.t2.partition.PartitionAlgorithm;
-import net.sf.taverna.t2.partition.algorithms.LiteralValuePartitionAlgorithm;
-
-public class UITest extends JFrame {
-
- private static final long serialVersionUID = -734851883737477053L;
-
- public UITest() {
- super();
- getContentPane().setLayout(new BorderLayout());
- List<PartitionAlgorithm<?>> paList = new ArrayList<PartitionAlgorithm<?>>();
- paList.add(new LiteralValuePartitionAlgorithm());
- paList.add(new LiteralValuePartitionAlgorithm());
- paList.add(new LiteralValuePartitionAlgorithm());
- PartitionAlgorithmListEditor pale = new PartitionAlgorithmListEditor(paList);
- getContentPane().add(pale, BorderLayout.NORTH);
- setVisible(true);
-
- }
-
- public static void main(String[] args) {
- JLabel l = new JLabel("Foo");
- System.out.println(l.getPreferredSize());
- System.out.println(l.getWidth());
-
- new UITest();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/test/java/net/sf/taverna/t2/partition/PartitionTestApplication.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/test/java/net/sf/taverna/t2/partition/PartitionTestApplication.java b/taverna-partition/src/test/java/net/sf/taverna/t2/partition/PartitionTestApplication.java
deleted file mode 100644
index 07364f1..0000000
--- a/taverna-partition/src/test/java/net/sf/taverna/t2/partition/PartitionTestApplication.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.FlowLayout;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.BoxLayout;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JScrollPane;
-import javax.swing.JTree;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
-import javax.swing.event.TreeModelEvent;
-import javax.swing.tree.TreeCellRenderer;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreePath;
-
-import net.sf.taverna.t2.partition.algorithms.LiteralValuePartitionAlgorithm;
-import net.sf.taverna.t2.partition.ui.TableTreeNodeColumn;
-import net.sf.taverna.t2.partition.ui.TableTreeNodeRenderer;
-
-/**
- * Exercise the partition algorithm codes
- *
- * @author Tom Oinn
- *
- */
-public class PartitionTestApplication {
-
- final static PropertyExtractorRegistry reg = new ExampleExtractorRegistry();
-
- public static void main(String[] args) throws InterruptedException {
- try {
- // Set System L&F
- UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
- } catch (Exception e) {
- //
- }
-
- JFrame frame = new JFrame("Partition test");
- frame.addWindowListener(new WindowAdapter() {
- @Override
- public void windowClosing(WindowEvent e) {
- System.exit(0);
- }
-
- });
-
- RootPartition<ExampleItem> partition = new RootPartition<ExampleItem>(
- getAlgorithms(), reg);
- JTree partitionTree = new AlwaysOpenJTree(partition);
- partitionTree.setRowHeight(24);
- TreeCellRenderer oldRenderer = partitionTree.getCellRenderer();
- TableTreeNodeRenderer ttnr = new TableTreeNodeRenderer(oldRenderer, 50) {
- @Override
- public TableTreeNodeColumn[] getColumns() {
- return new TableTreeNodeColumn[] {
- new TableTreeNodeColumnImpl("int", new Color(150, 150,
- 210), 60,reg),
- new TableTreeNodeColumnImpl("float", new Color(150,
- 210, 150), 60,reg),
- new TableTreeNodeColumnImpl("name", new Color(210, 150,
- 150), 60,reg) ,
- new TableTreeNodeColumnImpl("Fish", new Color(210, 150,
- 150), 60,reg) };
- }
- };
-
- ttnr.setBorderColour(new Color(150, 150, 150));
-
- partitionTree.setCellRenderer(ttnr);
-
- frame.getContentPane().setLayout(new BoxLayout(frame.getContentPane(),BoxLayout.Y_AXIS));
- frame.getContentPane().add(new JScrollPane(partitionTree));
- frame.getContentPane().add(new JScrollPane(partitionTree));
- frame.setSize(400, 200);
- frame.setVisible(true);
- boolean showFrames = false;
- //while (true) {
- ttnr.setDrawBorders(showFrames);
- showFrames = !showFrames;
- for (ExampleItem item : exampleItems) {
- Thread.sleep(200);
- partition.addOrUpdateItem(item);
- }
-// Thread.sleep(1000);
-// for (ExampleItem item : exampleItems) {
-// Thread.sleep(400);
-// partition.removeItem(item);
-// }
- //}
- }
-
- static ExampleItem[] exampleItems = new ExampleItem[] {
- new ExampleItem("foo", 1, 2.0f), new ExampleItem("bar", 1, 2.0f),
- new ExampleItem("foo", 4, 3.7f), new ExampleItem("foo", 3, 2.0f),
- new ExampleItem("bar", 1, 3.5f), new ExampleItem("bar", 1, 7.5f),
- new ExampleItem("foo", 1, 2.1f), new ExampleItem("bar", 1, 2.3f),
- new ExampleItem("foo", 4, 3.8f), new ExampleItem("foo", 3, 2.4f) };
-
- static class TableTreeNodeColumnImpl implements TableTreeNodeColumn {
-
- private String propertyName;
- private Color colour;
- private int columnWidth;
- private PropertyExtractorRegistry reg;
-
- public TableTreeNodeColumnImpl(String propertyName, Color colour,
- int width,PropertyExtractorRegistry reg) {
- this.propertyName = propertyName;
- this.colour = colour;
- this.columnWidth = width;
- this.reg=reg;
- }
-
- public Component getCellRenderer(Object value) {
- Object propertyValue = reg.getAllPropertiesFor(value).get(
- propertyName);
- if (propertyValue == null) {
- propertyValue = "Not defined";
- }
- return new JLabel(propertyValue.toString());
- }
-
- public Color getColour() {
- return this.colour;
- }
-
- public int getColumnWidth() {
- return columnWidth;
- }
-
- public String getDescription() {
- return "A description...";
- }
-
- public String getShortName() {
- return propertyName;
- }
-
- }
-
- static List<PartitionAlgorithm<?>> getAlgorithms() {
- List<PartitionAlgorithm<?>> paList = new ArrayList<PartitionAlgorithm<?>>();
- LiteralValuePartitionAlgorithm lvpa = new LiteralValuePartitionAlgorithm();
- lvpa.setPropertyName("float");
-
- LiteralValuePartitionAlgorithm lvpa2 = new LiteralValuePartitionAlgorithm();
- lvpa2.setPropertyName("int");
- LiteralValuePartitionAlgorithm lvpa3 = new LiteralValuePartitionAlgorithm();
- lvpa3.setPropertyName("name");
-
- paList.add(lvpa2);
- paList.add(lvpa);
- paList.add(lvpa3);
-
- return paList;
- }
-
- static class ExampleItem implements Comparable<Object>{
- private String name;
- private int intValue;
- private float floatValue;
-
- public String getName() {
- return this.name;
- }
-
- public int getIntValue() {
- return this.intValue;
- }
-
- public float getFloatValue() {
- return this.floatValue;
- }
-
- public ExampleItem(String name, int intValue, float floatValue) {
- this.name = name;
- this.intValue = intValue;
- this.floatValue = floatValue;
- }
-
- @Override
- public String toString() {
- return this.name;
- }
-
- public int compareTo(Object o) {
- // TODO Auto-generated method stub
- return 0;
- }
- }
-
- static class ExampleExtractorRegistry implements PropertyExtractorRegistry {
- public Map<String, Object> getAllPropertiesFor(Object target) {
- Map<String, Object> properties = new HashMap<String, Object>();
- if (target instanceof ExampleItem) {
- ExampleItem item = (ExampleItem) target;
- properties.put("name", item.getName());
- properties.put("int", item.getIntValue());
- properties.put("float", item.getFloatValue());
- properties.put("Fish", "Soup");
- }
-
- return properties;
- }
- }
-
- static class AlwaysOpenJTree extends JTree {
-
- private static final long serialVersionUID = -3769998854485605447L;
-
- public AlwaysOpenJTree(TreeModel newModel) {
- super(newModel);
- setEditable(false);
- setExpandsSelectedPaths(false);
- setDragEnabled(false);
- setScrollsOnExpand(false);
- // setSelectionModel(SingleSelectionModel.sharedInstance());
- }
-
- @Override
- public void setModel(TreeModel model) {
- if (treeModel == model)
- return;
- if (treeModelListener == null)
- treeModelListener = new TreeModelHandler() {
- @Override
- public void treeNodesInserted(final TreeModelEvent ev) {
- if (ev.getChildren()[0] instanceof Partition == false) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- TreePath path = ev.getTreePath();
- setExpandedState(path, true);
- fireTreeExpanded(path);
- }
- });
- }
-
- }
-
- };
- if (model != null) {
- model.addTreeModelListener(treeModelListener);
- }
- TreeModel oldValue = treeModel;
- treeModel = model;
- firePropertyChange(TREE_MODEL_PROPERTY, oldValue, model);
- }
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/test/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithmTest.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/test/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithmTest.java b/taverna-partition/src/test/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithmTest.java
deleted file mode 100644
index 4e8f93c..0000000
--- a/taverna-partition/src/test/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithmTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition.algorithms;
-
-import static org.junit.Assert.*;
-import net.sf.taverna.t2.partition.algorithms.LiteralValuePartitionAlgorithm;
-
-import org.junit.Test;
-
-public class LiteralValuePartitionAlgorithmTest {
-
- @Test
- public void testEquals() {
- LiteralValuePartitionAlgorithm a = new LiteralValuePartitionAlgorithm();
- LiteralValuePartitionAlgorithm b = new LiteralValuePartitionAlgorithm();
- LiteralValuePartitionAlgorithm c = new LiteralValuePartitionAlgorithm();
-
- a.setPropertyName("cheese");
- b.setPropertyName("cheese");
- c.setPropertyName("butter");
-
- assertEquals("They should be equal",a,a);
- assertEquals("They should be equal",a,b);
- assertFalse("They should not be equal",a.equals(c));
- assertFalse("They should not be equal",a.equals("cheese"));
- }
-
- @Test
- public void testHashcode() {
- LiteralValuePartitionAlgorithm a = new LiteralValuePartitionAlgorithm();
- LiteralValuePartitionAlgorithm b = new LiteralValuePartitionAlgorithm();
- LiteralValuePartitionAlgorithm c = new LiteralValuePartitionAlgorithm();
-
- a.setPropertyName("cheese");
- b.setPropertyName("cheese");
- c.setPropertyName("Z");
-
- assertEquals("They should have the same hashcode",a.hashCode(),b.hashCode());
- }
-
- @Test
- public void testConstructor() {
- LiteralValuePartitionAlgorithm p = new LiteralValuePartitionAlgorithm();
- assertNull("The property shoudl default to null",p.getPropertyName());
-
- p=new LiteralValuePartitionAlgorithm("pea");
- assertEquals("The property name should default to 'pea'","pea",p.getPropertyName());
- }
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-workbench-helper/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-helper/pom.xml b/taverna-workbench-helper/pom.xml
deleted file mode 100644
index bdf1641..0000000
--- a/taverna-workbench-helper/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.taverna.workbench</groupId>
- <artifactId>taverna-workbench</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
- </parent>
- <artifactId>helper</artifactId>
- <name>Help System (legacy dependency)</name>
- <dependencies>
- <dependency>
- <groupId>${project.parent.groupId}</groupId>
- <artifactId>helper-api</artifactId>
- <version>${project.parent.version}</version>
- </dependency>
- </dependencies>
-</project>
[5/5] incubator-taverna-workbench git commit: More poms
Posted by st...@apache.org.
More poms
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/4f8453f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/4f8453f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/4f8453f0
Branch: refs/heads/master
Commit: 4f8453f092c97ac84beb289eeee23ee3cf3a7c81
Parents: dee56b8
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Mar 19 16:38:31 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Mar 19 16:38:31 2015 +0000
----------------------------------------------------------------------
taverna-workbench-activity-palette-impl/pom.xml | 35 +++++++++++---------
taverna-workbench-activity-palette-ui/pom.xml | 30 ++++++++---------
taverna-workbench-activity-tools/pom.xml | 10 +++---
taverna-workbench-configuration-api/pom.xml | 8 ++---
taverna-workbench-configuration-impl/pom.xml | 29 ++++++++--------
5 files changed, 57 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4f8453f0/taverna-workbench-activity-palette-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-activity-palette-impl/pom.xml b/taverna-workbench-activity-palette-impl/pom.xml
index 6feab09..ef85913 100644
--- a/taverna-workbench-activity-palette-impl/pom.xml
+++ b/taverna-workbench-activity-palette-impl/pom.xml
@@ -23,72 +23,75 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>activity-palette-impl</artifactId>
+ <artifactId>taverna-activity-palette-impl</artifactId>
<packaging>bundle</packaging>
- <name>Activity Palette Impl</name>
- <description>Activity Palette Implementation</description>
+ <name>Apache Taverna Activity Palette Impl</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-palette-api</artifactId>
+ <artifactId>taverna-activity-palette-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.taverna.engine</groupId>
- <artifactId>workflowmodel-api</artifactId>
+ <artifactId>taverna-workflowmodel-api</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
+ <groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-observer</artifactId>
- <version>${t2.lang.version}</version>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
+ <version>${commons.beanutils.version}</version>
</dependency>
<dependency>
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
+ <version>${jdom.version}</version>
</dependency>
<!-- TODO Remove non-test impl dependency -->
<dependency>
<groupId>org.apache.taverna.engine</groupId>
- <artifactId>workflowmodel-impl</artifactId>
+ <artifactId>taverna-workflowmodel-impl</artifactId>
<version>${taverna.engine.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-impl</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-impl</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4f8453f0/taverna-workbench-activity-palette-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-activity-palette-ui/pom.xml b/taverna-workbench-activity-palette-ui/pom.xml
index 23d6fff..84d8d66 100644
--- a/taverna-workbench-activity-palette-ui/pom.xml
+++ b/taverna-workbench-activity-palette-ui/pom.xml
@@ -23,54 +23,54 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>activity-palette-ui</artifactId>
+ <artifactId>taverna-activity-palette-ui</artifactId>
<packaging>bundle</packaging>
- <name>Activity Palette UI Component</name>
- <description>Activity Palette UI</description>
+ <name>Apache Taverna Activity Palette UI Component</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-icons-api</artifactId>
+ <artifactId>taverna-activity-icons-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-palette-api</artifactId>
+ <artifactId>taverna-activity-palette-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
+ <artifactId>taverna-workbench-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
+ <artifactId>taverna-menu-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>helper-api</artifactId>
+ <artifactId>taverna-helper-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workflow-view</artifactId>
+ <artifactId>taverna-workflow-view</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
+ <groupId>${project.parent.groupId}</groupId>
<artifactId>uibuilder</artifactId>
- <version>${t2.lang.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.commons</groupId>
+ <groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-services-api</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4f8453f0/taverna-workbench-activity-tools/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-activity-tools/pom.xml b/taverna-workbench-activity-tools/pom.xml
index 9132ae1..53619a4 100644
--- a/taverna-workbench-activity-tools/pom.xml
+++ b/taverna-workbench-activity-tools/pom.xml
@@ -23,24 +23,24 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>activity-tools</artifactId>
+ <artifactId>taverna-activity-tools</artifactId>
<packaging>bundle</packaging>
- <name>Activity tools</name>
- <description>Tools useful for ui-activitys</description>
+ <name>Apache Taverna Activity tools</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
+ <artifactId>taverna-menu-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workbench-api</artifactId>
+ <artifactId>taverna-workbench-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.apache.taverna.language</groupId>
<artifactId>taverna-scufl2-api</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4f8453f0/taverna-workbench-configuration-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-configuration-api/pom.xml b/taverna-workbench-configuration-api/pom.xml
index c5d9a62..83ca7eb 100644
--- a/taverna-workbench-configuration-api/pom.xml
+++ b/taverna-workbench-configuration-api/pom.xml
@@ -23,15 +23,15 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>configuration-api</artifactId>
+ <artifactId>taverna-configuration-ui-api</artifactId>
<packaging>bundle</packaging>
- <name>Configuration Management API</name>
- <description>General configuration management</description>
+ <name>Apache Taverna Configuration Management UI API</name>
<dependencies>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-api</artifactId>
+ <version>${taverna.osgi.version}</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/4f8453f0/taverna-workbench-configuration-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-configuration-impl/pom.xml b/taverna-workbench-configuration-impl/pom.xml
index 3665c8c..56b57df 100644
--- a/taverna-workbench-configuration-impl/pom.xml
+++ b/taverna-workbench-configuration-impl/pom.xml
@@ -23,53 +23,52 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>configuration-impl</artifactId>
+ <artifactId>taverna-configuration-ui-impl</artifactId>
<packaging>bundle</packaging>
- <name>Configuration Management Implementations</name>
- <description>General configuration management</description>
-
+ <name>Apache Taverna Configuration Management UI Impl</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
+ <artifactId>taverna-menu-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>helper-api</artifactId>
+ <artifactId>taverna-helper-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>configuration-api</artifactId>
+ <artifactId>taverna-configuration-ui-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-api</artifactId>
- <version>${taverna.configuration.version}</version>
+ <version>${taverna.osgi.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-configuration-impl</artifactId>
- <version>0.1.1-SNAPSHOT</version>
+ <version>${taverna.osgi.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>uk.org.taverna.configuration</groupId>
+ <groupId>org.apache.taverna.osgi</groupId>
<artifactId>taverna-app-configuration-impl</artifactId>
- <version>0.1.1-SNAPSHOT</version>
+ <version>${taverna.osgi.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
[2/5] incubator-taverna-workbench git commit: Removed outdated modules
Posted by st...@apache.org.
Removed outdated modules
taverna-partition (not used sinced 2.0)
taverna-workbench-helper (now taverna-workbench-helper-api)
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/38dd9b23
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/38dd9b23
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/38dd9b23
Branch: refs/heads/master
Commit: 38dd9b23ffd3352934514c4846c146338802d119
Parents: 4357f05
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Mar 19 09:29:36 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Mar 19 09:29:36 2015 +0000
----------------------------------------------------------------------
taverna-partition/pom.xml | 22 -
.../sf/taverna/t2/partition/HashSetModel.java | 116 ----
.../net/sf/taverna/t2/partition/Partition.java | 441 ---------------
.../t2/partition/PartitionAlgorithm.java | 47 --
.../t2/partition/PartitionAlgorithmSetSPI.java | 36 --
.../t2/partition/PropertyExtractorRegistry.java | 37 --
.../t2/partition/PropertyExtractorSPI.java | 44 --
.../java/net/sf/taverna/t2/partition/Query.java | 56 --
.../sf/taverna/t2/partition/RootPartition.java | 394 -------------
.../net/sf/taverna/t2/partition/SetModel.java | 53 --
.../t2/partition/SetModelChangeListener.java | 42 --
.../algorithms/CustomPartitionAlgorithm.java | 98 ----
.../LiteralValuePartitionAlgorithm.java | 106 ----
.../ui/PartitionAlgorithmListEditor.java | 224 --------
.../t2/partition/ui/TableTreeNodeColumn.java | 69 ---
.../t2/partition/ui/TableTreeNodeRenderer.java | 554 -------------------
.../net/sf/taverna/t2/partition/ui/UITest.java | 58 --
.../t2/partition/PartitionTestApplication.java | 280 ----------
.../LiteralValuePartitionAlgorithmTest.java | 68 ---
taverna-workbench-helper/pom.xml | 35 --
20 files changed, 2780 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-partition/pom.xml b/taverna-partition/pom.xml
deleted file mode 100644
index 37439ae..0000000
--- a/taverna-partition/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sf.taverna.t2</groupId>
- <artifactId>lang</artifactId>
- <version>2.0.1-SNAPSHOT</version>
- </parent>
- <artifactId>taverna-partition</artifactId>
- <packaging>bundle</packaging>
- <name>Partition</name>
- <description>API for recursive subset partitioning</description>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/HashSetModel.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/HashSetModel.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/HashSetModel.java
deleted file mode 100644
index 3a66eb0..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/HashSetModel.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Implementation of SetModel based on a HashSet
- *
- * @author Tom Oinn
- */
-public class HashSetModel<ItemType> extends HashSet<ItemType> implements
- SetModel<ItemType> {
-
- /**
- *
- */
- private static final long serialVersionUID = 5763277571663880941L;
- // Listeners for set change events
- private List<SetModelChangeListener<ItemType>> changeListeners;
-
- /**
- * Default constructor, creates a set model based on a HashSet
- */
- public HashSetModel() {
- super();
- changeListeners = new ArrayList<SetModelChangeListener<ItemType>>();
- }
-
- /**
- * Implements SetModel
- */
- public synchronized void addSetModelChangeListener(
- SetModelChangeListener<ItemType> listener) {
- changeListeners.add(listener);
- }
-
- /**
- * Implements SetModel
- */
- public synchronized void removeSetModelChangeListener(
- SetModelChangeListener<ItemType> listener) {
- changeListeners.remove(listener);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public synchronized void clear() {
- notifyRemoval((Set<Object>) this);
- super.clear();
- }
-
- @Override
- public synchronized boolean add(ItemType item) {
- if (super.add(item)) {
- notifyAddition(Collections.singleton(item));
- return true;
- }
- return false;
- }
-
- @Override
- public synchronized boolean remove(Object item) {
- if (super.remove(item)) {
- notifyRemoval(Collections.singleton(item));
- return true;
- }
- return false;
- }
-
- /**
- * Push addition notification to listeners
- *
- * @param itemsAdded
- */
- private synchronized void notifyAddition(Set<ItemType> itemsAdded) {
- for (SetModelChangeListener<ItemType> listener : new ArrayList<SetModelChangeListener<ItemType>>(
- changeListeners)) {
- listener.itemsWereAdded(itemsAdded);
- }
- }
-
- /**
- * Push removal notification to listeners
- *
- * @param itemsRemoved
- */
- private synchronized void notifyRemoval(Set<Object> itemsRemoved) {
- for (SetModelChangeListener<ItemType> listener : new ArrayList<SetModelChangeListener<ItemType>>(
- changeListeners)) {
- listener.itemsWereRemoved(itemsRemoved);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/Partition.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/Partition.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/Partition.java
deleted file mode 100644
index e1e5819..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/Partition.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import javax.swing.event.TreeModelEvent;
-import javax.swing.tree.TreePath;
-
-/**
- * A partition represents a set of items which can be exclusively classified
- * into one or more distinct subsets along with the algorithm to perform this
- * subset operation.
- *
- * @author Tom Oinn
- *
- * @param <ItemType>
- * all items in the underlying set of which this is a subset are
- * instances of this type or can be cast to it according to
- * conventional java language rules.
- * @param <PartitionValueType>
- * the partition value type used by the parent partition algorithm to
- * create this partition object. As an example, if this partition
- * object represented all those entries with a particular host
- * institution this would be a String or possibly URL.
- * @param <ChildPartitionValueType>
- * the partition value type used by this partition's partition
- * algorithm to create sub-partitions, it's used in the signature
- * here because ordering of children is done based on these values.
- * Any child partition will have a getPartitionValue return type
- * cast-able to this type.
- */
-public class Partition<ItemType extends Comparable, PartitionValueType, ChildPartitionValueType> {
-
- // A comparator operating over the value type of the child partitions and
- // used to order them as created or to re-order on a change of this property
- private Comparator<ChildPartitionValueType> childPartitionOrder = null;
-
- // Back reference to the root partition of which this is a direct or
- // indirect sub-partition. If this *is* the root partition this points to
- // self
- protected RootPartition<ItemType> root;
-
- // A subset of the parent's member set containing items which have been
- // allocated to this partition by the parent's partition algorithm. The
- // partition is specified by the partitionValue field.
- private List<ItemType> members;
-
- // The parent partition of which this is a subset
- private Partition<ItemType, ?, PartitionValueType> parent;
-
- // Specification of the partition in terms of the parent's partitioning
- // algorithm
- private PartitionValueType partitionValue;
-
- // List of partitioning algorithms to be applied to this subset to create
- // further partitions, the algorithm at index 0 is the one used for this
- // partition, all others are passed in to the constructors for
- // sub-partitions
- protected List<PartitionAlgorithm<?>> partitionAlgorithms;
-
- // An initially empty list of sub-partitions created by the head element of
- // the partition algorithm list
- protected List<Partition<ItemType, ChildPartitionValueType, ?>> children;
-
- // Path from this node back to the root, initialised on first access and
- // cached
- private List<Partition<ItemType, ?, ?>> partitionPath = null;
-
- // For leaf partitions this is equal to the number of items in the member
- // set, for all other partitions it is the sum of the item count of all
- // child partitions
- protected int itemCount = 0;
-
- /**
- * Construct a new Partition, this is used by the RootPartition and by this
- * class to construct the recursively sub-divided partition structure based
- * on the rules encapsulated by the partition algorithm list.
- *
- * @param parent
- * parent partition of which this is a subset
- * @param pa
- * partition algorithm list, with the algorithm used to create
- * child partitions of this one at position 0, if this list is
- * empty this is a leaf partition.
- * @param root
- * reference to the RootPartition acting as the externally
- * visible front-end to this structure
- * @param pv
- * the value which the parent's partition algorithm has assigned
- * to this partition. This must be interpreted in the context of
- * the parent's first partition algorithm for display and other
- * purposes
- */
- protected Partition(Partition<ItemType, ?, PartitionValueType> parent,
- List<PartitionAlgorithm<?>> pa, RootPartition<ItemType> root,
- PartitionValueType pv) {
- this.root = root;
- this.members = new ArrayList<ItemType>();
- this.parent = parent;
- this.partitionValue = pv;
- this.partitionAlgorithms = pa;
- this.children = new ArrayList<Partition<ItemType, ChildPartitionValueType, ?>>();
- }
-
- /**
- * Return the number of items below this node in the partition tree; in the
- * case of leaf partitions this is the number of items in the member set,
- * for non-leaf partitions it is the sum of the item count for all immediate
- * child partitions.
- */
- public int getItemCount() {
- return this.itemCount;
- }
-
- /**
- * Sub-partitions of this partition are ordered based on a comparator over
- * the child partition value type.
- *
- * @return a comparator over child partition value types, or null if no
- * comparator has been specified (by default this returns null)
- */
- public Comparator<ChildPartitionValueType> getChildPartitionOrder() {
- return this.childPartitionOrder;
- }
-
- /**
- * Set a comparator for child partition ordering - if the supplied
- * comparator is different to the current one this will also trigger a
- * re-order of all child partitions and corresponding events in the root
- * partition's tree view. In the current implementation this is the very
- * broad 'tree structure changed' event for this node in the tree view.
- *
- * @param order
- * a new comparator to order child partitions
- */
- public void setChildPartitionOrder(Comparator<ChildPartitionValueType> order) {
- if (!order.equals(childPartitionOrder)) {
- childPartitionOrder = order;
- sortChildPartitions();
- }
- }
-
- /**
- * Return the parent partition of which this is a sub-partition, or null if
- * this is the root partition.
- */
- public Partition<ItemType, ?, PartitionValueType> getParent() {
- return this.parent;
- }
-
- /**
- * The parent partition created this partition based on a particular value
- * of a property of the members of the sub-partition. This returns that
- * value, and is the result returned from the parent partition's first
- * partition algorithm when run on all members of this partition or its
- * direct or indirect sub-partitions.
- */
- public PartitionValueType getPartitionValue() {
- return this.partitionValue;
- }
-
- @Override
- public String toString() {
- if (getParent() != null) {
- // query type
- String string = this.getParent().getPartitionAlgorithms().get(0)
- .toString();
- // result of query
- String string2 = this.partitionValue.toString();
- return string2 + " (" + getItemCount() + ")";
- } else {
- // This is for a root partition, loop through its children to return
- // the correct number when running a new query
- int items = 0;
- for (Partition child : children) {
- items = items + child.getItemCount();
- }
- String queryType = getPartitionAlgorithms().get(0).toString();
- // return "Activities which match query = " + getItemCount();
- return "Available activities (" + items + ")";
- //+ ", query by "
- // + queryType;
- }
- }
-
- /**
- * Return a list of Partition objects from the root (at index 0) to this
- * node at the final position in the list. Computes the first time then
- * caches, as it should be impossible for this to be modified without
- * recreation of the entire structure from scratch.
- */
- public synchronized List<Partition<ItemType, ?, ?>> getPartitionPath() {
- if (partitionPath == null) {
- List<Partition<ItemType, ?, ?>> al = new ArrayList<Partition<ItemType, ?, ?>>();
- Partition<ItemType, ?, ?> activePartition = this;
- al.add(activePartition);
- while (activePartition.getParent() != null) {
- al.add(0, activePartition.getParent());
- activePartition = activePartition.getParent();
- }
- partitionPath = al;
- }
- return partitionPath;
- }
-
- /**
- * If this is a leaf partition, defined as one with an empty list of
- * partition algorithms, then this method returns the set of all items which
- * have been classified as belonging to this leaf partition. For non-leaf
- * partitions it will return an empty set.
- */
- public final List<ItemType> getMembers() {
- return Collections.unmodifiableList(this.members);
- }
-
- /**
- * The list of partition algorithms applicable to this node (at index 0) and
- * subsequent downstream sub-partitions of it. If this is empty then the
- * partition is a leaf partition.
- */
- public final List<PartitionAlgorithm<?>> getPartitionAlgorithms() {
- return Collections.unmodifiableList(partitionAlgorithms);
- }
-
- /**
- * Sub-partitions of this partition defined by the partition algorithm at
- * index 0 of the list. If this is a leaf partition this will always be
- * empty.
- */
- public final List<Partition<ItemType, ChildPartitionValueType, ?>> getChildren() {
- return Collections.unmodifiableList(children);
- }
-
- /**
- * Inject an item into this partition, if there are partition algorithms in
- * the partition algorithm list (i.e. this is not a leaf) this will
- * recursively call the same method on child partitions or create new
- * partitions where there are none that match the value from the partition
- * algorithm. If this is a leaf partition the item is added to the member
- * set. The list is sorted when adding an item and it is inserted in the
- * appropriate place
- *
- * @param item
- * the item to add to the partition structure.
- */
- @SuppressWarnings("unchecked")
- protected synchronized void addItem(ItemType item) {
- if (partitionAlgorithms.isEmpty()) {
- // itemCount = 0;
- // Allocate directly to member set, no further partitioning
- members.add(item);
- Collections.sort(members);
- int indexOf = members.indexOf(item);
- // root.treeNodesInserted(new TreeModelEvent(this, getTreePath(),
- // new int[] { members.size() - 1 }, new Object[] { item }));
- root.treeNodesInserted(new TreeModelEvent(this, getTreePath(),
- new int[] { indexOf }, new Object[] { item }));
- // Increment item count for all partitions in the partition path
- for (Partition<ItemType, ?, ?> p : getPartitionPath()) {
- synchronized (p) {
- p.itemCount++;
- root.treeNodesChanged(new TreeModelEvent(this, p
- .getTreePath()));
- }
- }
-
- // Cache the storage of this item to this partition in the root
- // partition for more efficient removal if required (saves having to
- // search the entire partition tree, although that wouldn't be too
- // painful if it was required this is faster at the cost of a few
- // bytes of memory)
- root.itemStoredAt(item, this);
- // TODO - when the tree model covers items on the leaf nodes we'll
- // want to message it here as well.
- } else {
- PartitionAlgorithm<ChildPartitionValueType> pa;
- pa = (PartitionAlgorithm<ChildPartitionValueType>) partitionAlgorithms
- .get(0);
- ChildPartitionValueType pvalue = pa.allocate(item, root
- .getPropertyExtractorRegistry());
- // FIXME not sure how to do this since you seem to have to add the
- // items to the partition if you want to then search them again,
- // maybe you need a non-showing partition or something?
- // //if it is a failed search then don't bother adding to the
- // partition
- // if (pvalue.toString().equalsIgnoreCase("No match")) {
- // return;
- // }
- // See if there's a partition with this value already in the child
- // partition list
- for (Partition<ItemType, ChildPartitionValueType, ?> potentialChild : children) {
- if (potentialChild.getPartitionValue().equals(pvalue)) {
- potentialChild.addItem(item);
- return;
- }
- }
- // If not we have to create a new sub-partition
- List<PartitionAlgorithm<?>> tail = new ArrayList<PartitionAlgorithm<?>>();
- for (int i = 1; i < partitionAlgorithms.size(); i++) {
- tail.add(partitionAlgorithms.get(i));
- }
- Partition<ItemType, ChildPartitionValueType, ?> newPartition = new Partition(
- this, tail, this.root, pvalue);
- // Insert the new partition in the correct place according to the
- // comparator currently installed, or at the end if none exists or
- // the list is empty
- if (childPartitionOrder == null || children.isEmpty()) {
- children.add(newPartition);
- root.treeNodesInserted(new TreeModelEvent(this, getTreePath(),
- new int[] { children.indexOf(newPartition) },
- new Object[] { newPartition }));
- } else {
- boolean foundIndex = false;
- for (int i = 0; i < children.size(); i++) {
- ChildPartitionValueType existingPartitionValue = children
- .get(i).getPartitionValue();
- if (childPartitionOrder.compare(pvalue,
- existingPartitionValue) < 0) {
- children.add(i, newPartition);
- root.treeNodesInserted(new TreeModelEvent(this,
- getTreePath(), new int[] { i },
- new Object[] { newPartition }));
- if (i != 0) {
- root.treeStructureChanged(new TreeModelEvent(this,
- getTreePath()));
- }
- foundIndex = true;
- break;
- }
- }
- if (!foundIndex) {
- // Fallen off the end of the array without finding something
- // with greater index than the new partition so we add it at
- // the
- // end (by definition this is the largest value according to
- // the
- // comparator)
- children.add(newPartition);
- root.treeNodesInserted(new TreeModelEvent(this,
- getTreePath(), new int[] { children
- .indexOf(newPartition) },
- new Object[] { newPartition }));
- }
- }
- // Add the item to the new partition to trigger creation of any
- // sub-partitions required
- newPartition.addItem(item);
- }
- }
-
- /**
- * Remove an item from the member set
- *
- * @param item
- * the item to remove
- */
- protected void removeMember(ItemType item) {
- this.members.remove(item);
- }
-
- /**
- * Re-order the child partitions based on the comparator, if no comparator
- * has been defined this method does nothing. Tree structure changed
- * messages are fired from this node in the tree view if the comparator is
- * defined even if no nodes have been changed (lazy but not too much of an
- * issue I suspect)
- */
- protected synchronized final void sortChildPartitions() {
- if (this.childPartitionOrder == null) {
- // Can't do anything unless the comparator is set appropriately
- return;
- }
- Comparator<Partition<ItemType, ChildPartitionValueType, ?>> comparator = new Comparator<Partition<ItemType, ChildPartitionValueType, ?>>() {
- public int compare(
- Partition<ItemType, ChildPartitionValueType, ?> o1,
- Partition<ItemType, ChildPartitionValueType, ?> o2) {
- // FIXME is this really safe to do? It's fairly specific to our
- // case. Doesn't seem very generic
- if (o1.getPartitionValue().toString().equalsIgnoreCase(
- "no value")) {
- // No value so put it to the end
- return 1;
- }
- return childPartitionOrder.compare(o1.getPartitionValue(), o2
- .getPartitionValue());
- }
- };
- Collections.<Partition<ItemType, ChildPartitionValueType, ?>> sort(
- children, comparator);
- // Message the root that the node structure under this node has changed
- // (this is a bit lazy and we could almost certainly be more clever here
- // as the nodes have been removed and added to re-order them)
- root.treeStructureChanged(new TreeModelEvent(this, getTreePath()));
- }
-
- /**
- * Return a TreePath object with this node as the final entry in the path
- */
- protected final synchronized TreePath getTreePath() {
- return new TreePath(getPartitionPath().toArray());
- }
-
- // public void sortItems() {
- // System.out.println("sorting the items");
- // synchronized (members) {
- // List<ItemType> oldOrder = new ArrayList<ItemType>(members);
- // Collections.sort(oldOrder);
- //
- // for (ItemType item : oldOrder) {
- // removeMember(item);
- // }
- // for (ItemType item : oldOrder) {
- // addItem(item);
- // }
- // }
- //
- // }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithm.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithm.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithm.java
deleted file mode 100644
index b7b80f6..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithm.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition;
-
-/**
- * Interface for classes which can partition a set of objects into subsets according
- * to some embedded partitioning rule
- *
- * @author Tom Oinn
- * @author Stuart Owen
- *
- * @param ValueType
- * the java type of values used to represent the distinct partitions
- * created by this algorithm, in many cases these will be primitive
- * java types such as String but they could represent ranges of
- * values in the case of binning of continuous quantities etc.
- */
-public interface PartitionAlgorithm<ValueType> {
-
- /**
- * Given an object to classify return the value of the partition into which
- * the object falls.
- *
- * @param newItem
- * @return
- */
- ValueType allocate(Object newItem, PropertyExtractorRegistry reg);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithmSetSPI.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithmSetSPI.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithmSetSPI.java
deleted file mode 100644
index 330a11a..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PartitionAlgorithmSetSPI.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition;
-
-import java.util.Set;
-
-/**
- * An SPI interface that provides access to a Set of partition algorithms.
- *
- * @author Stuart Owen
- *
- */
-public interface PartitionAlgorithmSetSPI {
- /**
- * @return a Set of PartitionAlgorithms
- */
- public Set<PartitionAlgorithm<?>> getPartitionAlgorithms();
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorRegistry.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorRegistry.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorRegistry.java
deleted file mode 100644
index 229aa87..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorRegistry.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition;
-
-import java.util.Map;
-
-/**
- * Convenience to allow caching of property extractors. Implementations should
- * scan for available PropertyExtractorSPI implementations and use these to get
- * the properties for each target, caching as applicable.
- *
- * @author Tom Oinn
- *
- */
-public interface PropertyExtractorRegistry {
-
- public Map<String, Object> getAllPropertiesFor(Object target);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorSPI.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorSPI.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorSPI.java
deleted file mode 100644
index 130f2b7..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/PropertyExtractorSPI.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition;
-
-import java.util.Map;
-
-/**
- * SPI for classes which can extract or infer a set of named properties from a
- * target object.
- *
- * @author Tom Oinn
- *
- */
-public interface PropertyExtractorSPI {
-
- /**
- * Given a target object extract or infer the property map from it. If the
- * target is one which this plugin cannot act on then simply return an empty
- * map.
- *
- * @param target
- * @return
- */
- Map<String, Object> extractProperties(Object target);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/Query.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/Query.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/Query.java
deleted file mode 100644
index c8f3cb6..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/Query.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition;
-
-import java.util.Date;
-
-/**
- * Defines a query which can be re-run and which presents a set view on its
- * results. The Query is intended to represent both the old Taverna scavenger
- * class (which were queries in all but name) and new integration with external
- * search-able repositories in which case the term 'query' is a more literal
- * description.
- *
- * @author Tom Oinn
- *
- * @param <ItemType>
- * the parameterised type of the result set of the query
- */
-public interface Query<ItemType> extends SetModel<ItemType> {
-
- /**
- * Run the query. The query has internal state from any previous runs
- * (including the initial empty state) and will notify all listeners from
- * the SetModel interface of any items that are present in the new query
- * result and not in the old state or vice versa. It also updates the query
- * time to be the current time.
- */
- public void doQuery();
-
- /**
- * Returns the time at which the query was last invoked, or null if the
- * query has not been invoked yet.
- *
- * @return time of last call to doQuery or null if this hasn't happened yet.
- */
- public Date getLastQueryTime();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/RootPartition.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/RootPartition.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/RootPartition.java
deleted file mode 100644
index 64edfd8..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/RootPartition.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.swing.SwingUtilities;
-import javax.swing.event.TreeModelEvent;
-import javax.swing.event.TreeModelListener;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreePath;
-
-/**
- * Subclass of Partition acting as the public access point for the partition
- * structure. Exposes a TreeModel for use with a UI.
- *
- * @author Tom Oinn
- *
- * @param <ItemType>
- * all items added to this partition must cast to this type
- */
-public class RootPartition<ItemType extends Comparable> extends
- Partition<ItemType, Object, Object> implements TreeModel {
-
- // Used to track where we ended up putting items with the addOrUpdateItem
- // method, this makes checking for duplicate items, reclassification and
- // removal of partitions much faster at the expense of a few bytes of memory
- private Map<ItemType, Partition<ItemType, ?, ?>> itemToLeafPartition;
-
- private PropertyExtractorRegistry propertyExtractorRegistry;
-
- private final SetModelChangeListener<ItemType> setChangeListener = new SetModelChangeListener<ItemType>() {
-
- private List<Query<?>> queryList = new ArrayList<Query<?>>();
-
- public void itemsWereAdded(Set<ItemType> newItems) {
- for (ItemType item : newItems) {
- addOrUpdateItem(item);
- }
- }
-
- @SuppressWarnings("unchecked")
- public void itemsWereRemoved(Set<Object> itemsRemoved) {
- for (Object item : itemsRemoved) {
- try {
- removeItem((ItemType) item);
- } catch (ClassCastException cce) {
- // Obviously wasn't the right type of item but that means it
- // couldn't have been added in the first place so we can
- // safely ignore this.
- }
- }
- }
-
- public void addQuery(Query<?> query) {
- queryList.add(query);
- }
-
- public List<Query<?>> getQueries() {
- return queryList;
- }
-
- };
-
- /**
- * Build a new empty root partition with the specified list of partition
- * algorithm implementations used to recursively allocate new data items to
- * the sub-partitions below this one on addition
- *
- * @param pa
- */
- public RootPartition(List<PartitionAlgorithm<?>> pa,
- PropertyExtractorRegistry per) {
- super(null, pa, null, null);
- this.root = this;
- this.propertyExtractorRegistry = per;
- this.itemToLeafPartition = new HashMap<ItemType, Partition<ItemType, ?, ?>>();
- }
-
- /**
- * The root partition comes with a convenience implementation of
- * SetModelChangeListener which can be used to attach it to a compliant
- * instance of SetModel (assuming the item types match). This allows the
- * SetModel to act as the backing data store for the partition - as Query
- * and the various subset / set union operators also implement this it
- * provides a relatively simple mechanism to link multiple sets of data to
- * this partition.
- */
- public SetModelChangeListener<ItemType> getSetModelChangeListener() {
- return this.setChangeListener;
- }
-
- /**
- * Alter the list of partition algorithms which drive the construction of
- * the partitions. Calling this effectively forces a complete rebuild of the
- * tree structure which is an expensive operation so be careful when you use
- * it.
- *
- * @param pa
- * a new list of PartitionAlgorithmSPI instances to use as the
- * basis for the partition structure.
- */
- public synchronized void setPartitionAlgorithmList(
- List<PartitionAlgorithm<?>> pa) {
- if (pa.equals(this.partitionAlgorithms)) {
- // At the least this checks for reference equality, although I'm not
- // sure it does much more than that. TODO - replace this with a
- // smarter check to see whether the list has really changed, doing a
- // full re-build is expensive.
- return;
- }
- // First create a copy of the keyset containing all the items we've
- // added to this point.
- Set<ItemType> itemsToAdd = new HashSet<ItemType>(itemToLeafPartition
- .keySet());
- this.partitionAlgorithms = pa;
- this.children.clear();
- this.itemToLeafPartition.clear();
- treeStructureChanged(new TreeModelEvent(this, getTreePath()));
- for (ItemType item : itemsToAdd) {
- addOrUpdateItem(item);
- }
- sortChildPartitions();
- }
-
- /**
- * Add a new item to the partition structure. If the item already exists
- * this is interpreted as a request to reclassify according to properties
- * which may have changed. This is not the same as a reclassification due to
- * modification of the partition algorithm list, and just refers to the
- * specified item. If the item exists already and its classification is
- * changed the model will be notified with a removal event from the previous
- * location and the item will be added as usual immediately afterwards.
- */
- public synchronized void addOrUpdateItem(ItemType item) {
- // First check whether the item is already stored
- if (itemToLeafPartition.containsKey(item)) {
- // request to reclassify item.
- List<Partition<ItemType, ?, ?>> partitions = itemToLeafPartition
- .get(item).getPartitionPath();
- // partitions[i].getPartitionValue is the result of running
- // getPartitionAlgorithms[i-1] on the item, we run through the array
- // until either we hit the end (no reclassification) or the item
- // classifies differently in which case we remove and re-add it.
- for (int i = 1; i < partitions.size(); i++) {
- PartitionAlgorithm<?> pa = getPartitionAlgorithms().get(
- i - 1);
- Object existingValue = partitions.get(i).getPartitionValue();
- Object reclassifiedValue = pa.allocate(item,
- getPropertyExtractorRegistry());
- if (existingValue.equals(reclassifiedValue) == false) {
- // Items classify differently, remove it
- removeItem(item);
- // ...and add it back again, forcing reclassification
- super.addItem(item);
- return;
- }
- }
- // return as the item wasn't changed.
- return;
- } else {
- // Value wasn't already in the map so we just add it as usual
- super.addItem(item);
- }
-
- }
-
- /**
- * Remove an item from the partition structure, if this leaves any
- * partitions with zero item count they are removed as well to keep things
- * tidy.
- *
- * @param item
- * the item to remove from the partition structure. If this isn't
- * present in the structure this method does nothing along the
- * lines of the collections API.
- */
- public synchronized void removeItem(ItemType item) {
- Partition<ItemType, ?, ?> partition = itemToLeafPartition.get(item);
- if (partition != null) {
- // Remove the item from the leaf partition
- int previousIndex = partition.getMembers().indexOf(item);
- TreePath pathToPartition = partition.getTreePath();
- //partition.removeMember(item);
- for (Partition<ItemType, ?, ?> parentPathElement : partition
- .getPartitionPath()) {
- // Notify path to root that the number of members
- // has changed and it should update the renderers of
- // any attached trees
- treeNodesChanged(new TreeModelEvent(this, parentPathElement
- .getTreePath()));
- }
- partition.removeMember(item);
- treeNodesRemoved(new TreeModelEvent(this, pathToPartition,
- new int[] { previousIndex }, new Object[] { item }));
- // Traverse up the partition path and decrement the item count. If
- // any item count becomes zero we mark this as a partition to
- // remove, then at the end we remove the highest level one (so we
- // only have to send a single delete event to the tree view)
- for (Partition<ItemType, ?, ?> p : partition.getPartitionPath()) {
- synchronized (p) {
- p.itemCount--;
- if (p.getItemCount() == 0 && p != this) {
- // Can remove this node, all nodes after this will by
- // definition have item count of zero. The exception is
- // if this is the root node, in which case we just
- // ignore it and move on to the next child. This avoids
- // deleting the root, which is generally not a smart
- // thing to do to a tree.
- Partition<ItemType, ?, ?> parent = p.getParent();
- int indexInParent = getIndexOfChild(parent, p);
- parent.children.remove(indexInParent);
- treeNodesRemoved(new TreeModelEvent(this, parent
- .getTreePath(), new int[] { indexInParent },
- new Object[] { p }));
-
- break;
- }
- }
- }
- itemToLeafPartition.remove(item);
- }
- treeStructureChanged(new TreeModelEvent(this,getTreePath()));
- }
-
- /**
- * Called by a leaf Partition when it has stored an item in its member set,
- * used to keep track of where items have been stored to make removal more
- * efficient.
- */
- void itemStoredAt(ItemType item, Partition<ItemType, ?, ?> partition) {
- itemToLeafPartition.put(item, partition);
- }
-
- // ---------------------//
- // TreeModel interfaces //
- // ---------------------//
- private List<TreeModelListener> treeListeners = new ArrayList<TreeModelListener>();
-
- @SuppressWarnings("unchecked")
- public synchronized Object getChild(Object parent, int index) {
- if (parent instanceof Partition) {
- Partition<ItemType, ?, ?> p = (Partition<ItemType, ?, ?>) parent;
- if (p.getMembers().isEmpty() == false) {
- if (index < 0 || index >= p.getMembers().size()) {
- return null;
- } else {
- return p.getMembers().get(index);
- }
- } else {
- if (index < 0 || index >= p.getChildren().size()) {
- return null;
- } else {
- return p.getChildren().get(index);
- }
- }
- }
- return null;
- }
-
- @SuppressWarnings("unchecked")
- public synchronized int getChildCount(Object parent) {
- if (parent instanceof Partition) {
- Partition<ItemType, ?, ?> p = (Partition<ItemType, ?, ?>) parent;
- if (p.getMembers().isEmpty() == false) {
- return p.getMembers().size();
- }
- return p.getChildren().size();
- }
- return 0;
- }
-
- @SuppressWarnings("unchecked")
- public synchronized int getIndexOfChild(Object parent, Object child) {
- if (parent != null && child != null && parent instanceof Partition
- && child instanceof Partition) {
- Partition<ItemType, ?, ?> p = (Partition<ItemType, ?, ?>) parent;
- Partition<ItemType, ?, ?> c = (Partition<ItemType, ?, ?>) child;
- if (p.root == c.root && p.root == this) {
- // Parent and child must both be members of this tree structure
- return p.getChildren().indexOf(child);
- }
- } else if (parent != null && child != null
- && parent instanceof Partition) {
- Partition<ItemType, ?, ?> p = (Partition<ItemType, ?, ?>) parent;
- return p.getMembers().indexOf(child);
- }
- return -1;
-
- }
-
- public Object getRoot() {
- // The root partition is also the root of the tree model
- return this;
- }
-
- public boolean isLeaf(Object node) {
- // No leaves at the moment as we're only considering partitions which
- // are by definition not leaves (the items within the last partition are
- // but at the moment we're not including them in the tree model)
- return (!(node instanceof Partition));
- }
-
- public void removeTreeModelListener(TreeModelListener l) {
- treeListeners.remove(l);
- }
-
- public void addTreeModelListener(TreeModelListener l) {
- if (treeListeners.contains(l) == false) {
- treeListeners.add(l);
- }
- }
-
- public void valueForPathChanged(TreePath path, Object newValue) {
- // Ignore this, the tree values are never changed by the user in this
- // implementation so we don't have to do anything
- }
-
- // -------------------------------------------------------//
- // Tree event forwarding helper methods used by Partition //
- // -------------------------------------------------------//
-
- void treeNodesChanged(final TreeModelEvent e) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- for (TreeModelListener listener : new ArrayList<TreeModelListener>(
- treeListeners)) {
- listener.treeNodesChanged(e);
- }
- }
- });
- }
-
- void treeNodesInserted(final TreeModelEvent e) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- for (TreeModelListener listener : new ArrayList<TreeModelListener>(
- treeListeners)) {
- listener.treeNodesInserted(e);
- }
- }
- });
- }
-
- void treeNodesRemoved(final TreeModelEvent e) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- for (TreeModelListener listener : new ArrayList<TreeModelListener>(
- treeListeners)) {
- listener.treeNodesRemoved(e);
- }
- }
- });
- }
-
- void treeStructureChanged(final TreeModelEvent e) {
- SwingUtilities.invokeLater(new Runnable() {
- public void run() {
- for (TreeModelListener listener : new ArrayList<TreeModelListener>(
- treeListeners)) {
- listener.treeStructureChanged(e);
- }
- }
- });
- }
-
- public PropertyExtractorRegistry getPropertyExtractorRegistry() {
- return this.propertyExtractorRegistry;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/SetModel.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/SetModel.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/SetModel.java
deleted file mode 100644
index 393d697..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/SetModel.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition;
-
-import java.util.Set;
-
-/**
- * Extension of the java Set interface with the addition of change listener
- * support. Intended to be plugged into the RootPartition class so the partition
- * is synchronized with the set membership.
- *
- * @author Tom Oinn
- *
- * @param <ItemType>
- * the parameterised type of the set
- */
-public interface SetModel<ItemType> extends Set<ItemType> {
-
- /**
- * Add a listener to be notified of change events on the set's membership
- *
- * @param listener
- */
- public void addSetModelChangeListener(
- SetModelChangeListener<ItemType> listener);
-
- /**
- * Remove a previously registered change listener
- *
- * @param listener
- */
- public void removeSetModelChangeListener(
- SetModelChangeListener<ItemType> listener);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/SetModelChangeListener.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/SetModelChangeListener.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/SetModelChangeListener.java
deleted file mode 100644
index 176eb7c..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/SetModelChangeListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * Handler for change events on a SetModel instance
- *
- * @author Tom Oinn
- *
- */
-public interface SetModelChangeListener<ItemType> {
-
- public void itemsWereAdded(Set<ItemType> newItems);
-
- public void itemsWereRemoved(Set<Object> itemsRemoved);
-
- public List<Query<?>> getQueries();
-
- public void addQuery(Query<?> query);
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/algorithms/CustomPartitionAlgorithm.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/algorithms/CustomPartitionAlgorithm.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/algorithms/CustomPartitionAlgorithm.java
deleted file mode 100644
index b6a3eea..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/algorithms/CustomPartitionAlgorithm.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition.algorithms;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.sf.taverna.t2.partition.PartitionAlgorithm;
-import net.sf.taverna.t2.partition.PropertyExtractorRegistry;
-
-/**
- * Takes a custom search term and checks against the properties eg
- * "operation" of each of the available items. Adds the item to the activity
- * palette if it matches
- *
- * @author Ian Dunlop
- *
- */
-public class CustomPartitionAlgorithm implements PartitionAlgorithm<Object> {
-
- private String searchValue;
- private List<String> properties;
- private static String NO_SEARCH = "No match";
- private static String MATCHING_ITEMS = "Activities with a matching property";
-
- public String getSearchValue() {
- return searchValue;
- }
-
- public void setSearchValue(String searchValue) {
- this.searchValue = searchValue;
- }
-
- public CustomPartitionAlgorithm() {
- properties = new ArrayList<String>();
- }
-
- public CustomPartitionAlgorithm(String searchValue) {
- super();
- this.searchValue = searchValue;
- // this.propertyName = propertyName;
- properties = new ArrayList<String>();
- }
-
- public void addProperty(String propertyValue) {
- properties.add(propertyValue);
- }
-
- /**
- * Checks against the items property to see if it contains the search term.
- * Search each of the properties in {@link #properties} in turn
- */
- public Object allocate(Object newItem, PropertyExtractorRegistry reg) {
- for (String property : properties) {
- Object propertyValue = reg.getAllPropertiesFor(newItem).get(
- property);
- String itemString = newItem.toString();
- //search all the properties first
- if (propertyValue != null) {
- if (((String) propertyValue).contains(getSearchValue()
- .toLowerCase())) {
- return MATCHING_ITEMS;
- }
- }
- //then the name of the item
- if (itemString.toLowerCase().contains(
- getSearchValue().toLowerCase())) {
- return MATCHING_ITEMS;
- }
- }
- return NO_SEARCH;
-
- }
-
- @Override
- public String toString() {
- return "search term=" + this.searchValue;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithm.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithm.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithm.java
deleted file mode 100644
index b703d40..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/algorithms/LiteralValuePartitionAlgorithm.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition.algorithms;
-
-import net.sf.taverna.t2.partition.PartitionAlgorithm;
-import net.sf.taverna.t2.partition.PropertyExtractorRegistry;
-
-/**
- * A naive partition algorithm that simply returns the property value it's been
- * configured to use from the property getter.
- *
- * @author Tom
- *
- */
-public class LiteralValuePartitionAlgorithm implements
- PartitionAlgorithm<Object> {
-
- private String propertyName = null;
-
- private static String NO_PROPERTY = "No value";
-
- /**
- * Default constructor. The property name defaults to null, and needs setting using getPropertyName
- */
- public LiteralValuePartitionAlgorithm() {
-
- }
-
- /**
- * Constructor that initialised the LiteralValuePartitionAlgorithm with a property name
- *
- * @param propertyName
- */
- public LiteralValuePartitionAlgorithm(String propertyName) {
- super();
- this.propertyName = propertyName;
- }
-
- public Object allocate(Object newItem, PropertyExtractorRegistry reg) {
- if (propertyName == null) {
- return NO_PROPERTY;
- }
- else {
- Object propertyValue = reg.getAllPropertiesFor(newItem).get(propertyName);
- if (propertyValue == null) {
- return NO_PROPERTY;
- }
- else {
- return propertyValue;
- }
- }
- }
-
- public String getPropertyName() {
- return propertyName;
- }
-
- public void setPropertyName(String propertyName) {
- this.propertyName = propertyName;
- }
-
-
-
- /**
- * @return true if obj is a LiteralValuePartionAlgorithm and the property names match
- */
- @Override
- public boolean equals(Object obj) {
- if (obj instanceof LiteralValuePartitionAlgorithm) {
- LiteralValuePartitionAlgorithm alg = (LiteralValuePartitionAlgorithm)obj;
- return getPropertyName().equals(alg.getPropertyName());
- }
- else {
- return false;
- }
- }
-
- @Override
- public int hashCode() {
- return getPropertyName().hashCode();
- }
-
- @Override
- public String toString() {
- return this.propertyName;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/PartitionAlgorithmListEditor.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/PartitionAlgorithmListEditor.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/PartitionAlgorithmListEditor.java
deleted file mode 100644
index 9c05c44..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/PartitionAlgorithmListEditor.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition.ui;
-
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-import net.sf.taverna.t2.partition.PartitionAlgorithm;
-
-import java.awt.BasicStroke;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.geom.GeneralPath;
-import java.util.List;
-
-public class PartitionAlgorithmListEditor extends JPanel {
-
- // Serial version ID
- private static final long serialVersionUID = 8206805090698009524L;
-
- // Index of currently selected 'tab' or -1 if none selected
- private int selectedIndex = 1;
-
- // List of partition algorithm instances acting as the model for this
- // component
- private List<PartitionAlgorithm<?>> paList;
-
- private int cornerSep = 8;
- private int labelHorizontalPad = 10;
- private int labelBottomPad = 2;
- private int labelTopPad = 4;
- private float selectedStrokeWidth = 3f;
-
- public List<PartitionAlgorithm<?>> getPartitionAlgorithmList() {
- return null;
- }
-
- @Override
- public Dimension getPreferredSize() {
- if (paList.isEmpty()) {
- return new Dimension(0, 16 + labelBottomPad + labelTopPad);
- } else {
- return new Dimension(0, (int) new Tab(getLabelForPA(paList.get(0)))
- .getPreferredSize().getHeight());
- }
- }
-
- public PartitionAlgorithmListEditor(
- List<PartitionAlgorithm<?>> currentState) {
- super();
- this.paList = currentState;
- }
-
- protected JLabel getLabelForPA(PartitionAlgorithm<?> pa) {
- return new JLabel("Test...");
- }
-
- protected Color getBorderColorForPA(PartitionAlgorithm<?> pa) {
- return Color.black;
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- Graphics2D g2d = (Graphics2D) g.create();
- // Enable anti-aliasing for the curved lines
- g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
- RenderingHints.VALUE_ANTIALIAS_ON);
-
- int selectedStartsAt = 0;
- int selectedEndsAt = 0;
- Color frameColor = null;
- int cumulativeTranslation = 0;
-
- super.paintComponent(g2d);
-
- for (int i = 0; i < paList.size(); i++) {
-
- Tab t = new Tab(getLabelForPA(paList.get(i)));
- t.setBackground(new Color(150, 150, 255));
- t.setSelected(i == selectedIndex);
- int width = (int) (t.getPreferredSize()).getWidth();
- t.setSize(new Dimension(width, getHeight()));
- t.paint(g2d);
-
- if (i < selectedIndex) {
- selectedStartsAt += width;
- } else if (i == selectedIndex) {
- selectedEndsAt = selectedStartsAt + width;
- frameColor = t.getBackground();
- }
- cumulativeTranslation += width;
- g2d.translate(width, 0);
- }
-
-
- // Reset the transform
- g2d.translate(-cumulativeTranslation, 0);
- if (selectedIndex > 0) {
- g2d.setStroke(new BasicStroke(selectedStrokeWidth, BasicStroke.CAP_BUTT,
- BasicStroke.JOIN_MITER));
- int height = (int)(getHeight() - selectedStrokeWidth/2);
- // Render the selected index line...
- if (frameColor != null) {
- g2d.setPaint(frameColor.darker());
- }
- GeneralPath path = new GeneralPath();
- path.moveTo(0, height);
- path.lineTo(selectedStartsAt, height);
- path.lineTo(selectedStartsAt, cornerSep);
- path.curveTo(selectedStartsAt, cornerSep / 2, selectedStartsAt
- + cornerSep / 2, 0, selectedStartsAt + cornerSep, 0);
- path.lineTo(selectedEndsAt - cornerSep, 0);
- path.curveTo(selectedEndsAt - cornerSep / 2, 0, selectedEndsAt,
- cornerSep / 2, selectedEndsAt, cornerSep);
- path.lineTo(selectedEndsAt, height);
- path.lineTo(getWidth(), height);
-
- g2d.draw(path);
- }
- g2d.dispose();
- }
-
- @SuppressWarnings("serial")
- // Renderer for a single tab in the partition algorithm list, used as a
- // rubber stamp for a single tab in the tab list.
- class Tab extends JComponent {
-
- // Label to use to render tab contents
- private JLabel label;
-
- // If this is selected then we don't draw the stroke as it'll be drawn
- // on later.
- private boolean selected = false;
-
- @Override
- // Always false as we don't render the corners
- public boolean isOpaque() {
- return false;
- }
-
- public void setSelected(boolean b) {
- this.selected = b;
-
- }
-
- @Override
- public Dimension getPreferredSize() {
- Dimension d = label.getPreferredSize();
- return new Dimension((int) (d.getWidth()) + labelHorizontalPad * 2,
- ((int) d.getHeight()) + labelBottomPad + labelTopPad);
- }
-
- protected Tab(JLabel label) {
- super();
- this.label = label;
- }
-
- @Override
- public void setBackground(Color colour) {
- label.setBackground(colour);
- }
-
- @Override
- public Color getBackground() {
- return label.getBackground();
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- Graphics2D g2d = (Graphics2D) g.create();
-
- int width = getWidth();
- int height = getHeight();
-
- // Create a general path to draw the tab shape
- g2d.setPaint(label.getBackground());
- GeneralPath path = new GeneralPath();
- path.moveTo(0, height);
- path.lineTo(0, cornerSep);
- path.curveTo(0, cornerSep / 2, cornerSep / 2, 0, cornerSep, 0);
- path.lineTo(width - cornerSep, 0);
- path.curveTo(width - cornerSep / 2, 0, width, cornerSep / 2, width,
- cornerSep);
- path.lineTo(width, height);
- path.closePath();
- g2d.fill(path);
- if (!selected) {
- g2d.setPaint(label.getBackground().darker());
- g2d.draw(path);
- }
-
- label.setSize(width - labelHorizontalPad * 2, height
- - (labelBottomPad + labelTopPad));
- g2d.translate(labelHorizontalPad, labelTopPad);
- label.paint(g2d);
- g2d.translate(-labelHorizontalPad, -labelTopPad);
-
- g2d.dispose();
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/38dd9b23/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeColumn.java
----------------------------------------------------------------------
diff --git a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeColumn.java b/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeColumn.java
deleted file mode 100644
index c6b4b36..0000000
--- a/taverna-partition/src/main/java/net/sf/taverna/t2/partition/ui/TableTreeNodeColumn.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
-package net.sf.taverna.t2.partition.ui;
-
-import java.awt.Color;
-import java.awt.Component;
-
-/**
- * A column used in the tree part of the table tree node renderer
- *
- * @author Tom Oinn
- *
- */
-public interface TableTreeNodeColumn {
-
- /**
- * Get a string to use as the header text
- *
- * @return
- */
- public String getShortName();
-
- /**
- * Get a descriptive string for tooltips etc.
- *
- * @return
- */
- public String getDescription();
-
- /**
- * Given a node value render the appropriate property for this column
- *
- * @param value
- * @return
- */
- public Component getCellRenderer(Object value);
-
- /**
- * Return the width in pixels for this column
- *
- * @return
- */
- public int getColumnWidth();
-
- /**
- * Get a header colour - the actual column colour will be a stripe of the
- * result of applying the lighter operator twice and once to this colour.
- */
- public Color getColour();
-
-}
[4/5] incubator-taverna-workbench git commit: spurious 1/pom.xml
removed
Posted by st...@apache.org.
spurious 1/pom.xml removed
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/dee56b8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/dee56b8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/dee56b8f
Branch: refs/heads/master
Commit: dee56b8f529c94178a55f099eeb8f95d663f8b23
Parents: 49301de
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Mar 19 09:30:39 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Mar 19 09:30:39 2015 +0000
----------------------------------------------------------------------
1/pom.xml | 75 ----------------------------------------------------------
1 file changed, 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/dee56b8f/1/pom.xml
----------------------------------------------------------------------
diff --git a/1/pom.xml b/1/pom.xml
deleted file mode 100644
index 7e5841f..0000000
--- a/1/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>net.sf.taverna</groupId>
- <artifactId>taverna-parent</artifactId>
- <version>3.0.1-SNAPSHOT</version>
- </parent>
-
- <name>Taverna support utilities</name>
- <groupId>net.sf.taverna.t2</groupId>
- <artifactId>lang</artifactId>
- <version>2.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
- <version>${log4j.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <repositories>
- <repository>
- <releases />
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>mygrid-repository</id>
- <name>myGrid Repository</name>
- <url>http://www.mygrid.org.uk/maven/repository</url>
- </repository>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>mygrid-snapshot-repository</id>
- <name>myGrid Snapshot Repository</name>
- <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundles.release</id>
- <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/release</url>
- </repository>
- <repository>
- <id>com.springsource.repository.bundles.external</id>
- <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
- <url>http://repository.springsource.com/maven/bundles/external</url>
- </repository>
- </repositories>
- <modules>
- <module>beans</module>
- <module>io</module>
- <module>observer</module>
- <module>partition</module>
- <module>ui</module>
- <module>uibuilder</module>
- </modules>
- <scm>
- <connection>scm:git:https://github.com/taverna/taverna-support-utilities.git</connection>
- <developerConnection>scm:git:ssh://git@github.com:taverna/taverna-support-utilities.git</developerConnection>
- <url>https://github.com/taverna/taverna-support-utilities</url>
- <tag>HEAD</tag>
- </scm>
-</project>
[3/5] incubator-taverna-workbench git commit: org.apache.taverna.*
groupIds in poms
Posted by st...@apache.org.
org.apache.taverna.* groupIds in poms
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/commit/49301de8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/tree/49301de8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/diff/49301de8
Branch: refs/heads/master
Commit: 49301de812d05e2b5ebf49ac0f2f09243a3a7220
Parents: 38dd9b2
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Mar 19 09:30:09 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Mar 19 09:30:09 2015 +0000
----------------------------------------------------------------------
pom.xml | 2 -
taverna-beaninfo/pom.xml | 6 +--
taverna-dataflow-activity-ui/pom.xml | 25 +++++-----
taverna-disabled-activity-ui/pom.xml | 53 +++++----------------
taverna-io/pom.xml | 28 ++++++++---
taverna-stringconstant-activity-ui/pom.xml | 49 +++++--------------
taverna-ui/pom.xml | 36 ++++++++++----
taverna-uibuilder/pom.xml | 34 +++++++++----
taverna-unrecognized-activity-ui/pom.xml | 31 ++----------
taverna-workbench-activity-icons-api/pom.xml | 7 +--
taverna-workbench-activity-palette-api/pom.xml | 2 +-
11 files changed, 123 insertions(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/49301de8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0339d1b..b864f8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,6 @@
<module>taverna-workbench-file-impl</module>
<module>taverna-workbench-graph-model</module>
<module>taverna-workbench-graph-view</module>
- <module>taverna-workbench-helper</module>
<module>taverna-workbench-helper-api</module>
<module>taverna-workbench-httpproxy-config</module>
<module>taverna-workbench-iteration-strategy-ui</module>
@@ -96,7 +95,6 @@
<module>taverna-beans</module>
<module>taverna-io</module>
<module>taverna-observer</module>
- <module>taverna-partition</module>
<module>taverna-ui</module>
<module>taverna-uibuilder</module>
</modules>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/49301de8/taverna-beaninfo/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-beaninfo/pom.xml b/taverna-beaninfo/pom.xml
index 263f33d..d09598f 100644
--- a/taverna-beaninfo/pom.xml
+++ b/taverna-beaninfo/pom.xml
@@ -10,11 +10,11 @@
<groupId>net.sf.taverna.t2.lang</groupId>
<artifactId>taverna-beaninfo</artifactId>
<packaging>bundle</packaging>
- <name>BeanInfo extensions</name>
+ <name>Apache Taverna BeanInfo extensions</name>
<dependencies>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/49301de8/taverna-dataflow-activity-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-dataflow-activity-ui/pom.xml b/taverna-dataflow-activity-ui/pom.xml
index fc54db1..f900fa0 100644
--- a/taverna-dataflow-activity-ui/pom.xml
+++ b/taverna-dataflow-activity-ui/pom.xml
@@ -29,37 +29,37 @@
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-icons-api</artifactId>
+ <artifactId>taverna-activity-icons-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-palette-api</artifactId>
+ <artifactId>taverna-activity-palette-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>contextual-views-api</artifactId>
+ <artifactId>taverna-contextual-views-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>file-api</artifactId>
+ <artifactId>taverna-file-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>edits-api</artifactId>
+ <artifactId>taverna-edits-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workflow-view</artifactId>
+ <artifactId>taverna-workflow-view</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>graph-view</artifactId>
+ <artifactId>taverna-graph-view</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
@@ -71,30 +71,30 @@
<dependency>
<groupId>javax.help</groupId>
<artifactId>javahelp</artifactId>
- <version>${javahelp.version}</version>
+ <version>${javahelp.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-tools</artifactId>
+ <artifactId>taverna-activity-tools</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>helper-api</artifactId>
+ <artifactId>taverna-helper-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<!-- testing dependencies -->
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>file-impl</artifactId>
+ <artifactId>taverna-file-impl</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>edits-impl</artifactId>
+ <artifactId>taverna-edits-impl</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency>
@@ -106,4 +106,3 @@
</dependency> -->
</dependencies>
</project>
-
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/49301de8/taverna-disabled-activity-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-disabled-activity-ui/pom.xml b/taverna-disabled-activity-ui/pom.xml
index c26dcdc..82f8dc4 100644
--- a/taverna-disabled-activity-ui/pom.xml
+++ b/taverna-disabled-activity-ui/pom.xml
@@ -23,39 +23,38 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>disabled-activity-ui</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <artifactId>taverna-disabled-activity-ui</artifactId>
<packaging>bundle</packaging>
- <name>Taverna 2 Disabled Activity UI</name>
+ <name>Apache Taverna Disabled Activity UI</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-icons-api</artifactId>
+ <artifactId>taverna-activity-icons-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
+ <artifactId>taverna-menu-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>report-api</artifactId>
+ <artifactId>taverna-report-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>contextual-views-impl</artifactId>
+ <artifactId>taverna-contextual-views-impl</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-tools</artifactId>
+ <artifactId>taverna-activity-tools</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workflow-view</artifactId>
+ <artifactId>taverna-workflow-view</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
@@ -69,42 +68,14 @@
<version>${javahelp.version}</version>
</dependency>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>uibuilder</artifactId>
- <version>${t2.lang.version}</version>
+ <groupId>${project.parent.groupId}</groupId>
+ <artifactId>taverna-uibuilder</artifactId>
+ <version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>helper</artifactId>
+ <artifactId>taverna-helper-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <releases />
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>mygrid-repository</id>
- <name>myGrid Repository</name>
- <url>http://www.mygrid.org.uk/maven/repository
- </url>
- </repository>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>mygrid-snapshot-repository</id>
- <name>myGrid Snapshot Repository</name>
- <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
- </repository>
- </repositories>
- <scm>
- <connection>scm:git:https://github.com/taverna/taverna-disabled-activity-ui.git</connection>
- <developerConnection>scm:git:ssh://git@github.com/taverna/taverna-disabled-activity-ui.git</developerConnection>
- <url>https://github.com/taverna/taverna-disabled-activity-ui/</url>
- <tag>HEAD</tag>
- </scm>
</project>
-
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/49301de8/taverna-io/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-io/pom.xml b/taverna-io/pom.xml
index 19a3c4d..3a97b7d 100644
--- a/taverna-io/pom.xml
+++ b/taverna-io/pom.xml
@@ -1,19 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.sf.taverna.t2</groupId>
- <artifactId>lang</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <groupId>org.apache.taverna.workbench</groupId>
+ <artifactId>taverna-workbench</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>taverna-io</artifactId>
<packaging>bundle</packaging>
- <name>IO utility classes</name>
+ <name>Apache Taverna IO utility classes</name>
<dependencies>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/49301de8/taverna-stringconstant-activity-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-stringconstant-activity-ui/pom.xml b/taverna-stringconstant-activity-ui/pom.xml
index d48fb57..6219496 100644
--- a/taverna-stringconstant-activity-ui/pom.xml
+++ b/taverna-stringconstant-activity-ui/pom.xml
@@ -23,40 +23,39 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>stringconstant-activity-ui</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <artifactId>taverna-stringconstant-activity-ui</artifactId>
<packaging>bundle</packaging>
- <name>Taverna 2 StringConstant Activity UI</name>
+ <name>Apache Taverna StringConstant Activity UI</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-icons-api</artifactId>
+ <artifactId>taverna-activity-icons-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-palette-api</artifactId>
+ <artifactId>taverna-activity-palette-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>menu-api</artifactId>
+ <artifactId>taverna-menu-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>contextual-views-api</artifactId>
+ <artifactId>taverna-contextual-views-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>workflow-view</artifactId>
+ <artifactId>taverna-workflow-view</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
- <groupId>uk.org.taverna.commons</groupId>
+ <groupId>org.apache.taverna.engine</groupId>
<artifactId>taverna-services-api</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <version>${taverna.enigne.version}</version>
</dependency>
<dependency>
@@ -68,46 +67,24 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <version>${junit.version}</version>
<scope>test</scope>
</dependency>
<!-- <dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-palette-impl</artifactId>
+ <artifactId>taverna-activity-palette-impl</artifactId>
<version>${project.parent.version}</version>
<scope>test</scope>
</dependency> -->
<!-- <dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-tools</artifactId>
+ <artifactId>taverna-activity-tools</artifactId>
<version>${project.parent.version}</version>
</dependency> -->
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>activity-tools</artifactId>
+ <artifactId>taverna-activity-tools</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <releases />
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>mygrid-repository</id>
- <name>myGrid Repository</name>
- <url>http://www.mygrid.org.uk/maven/repository
- </url>
- </repository>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>mygrid-snapshot-repository</id>
- <name>myGrid Snapshot Repository</name>
- <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
- </repository>
- </repositories>
</project>
-
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/49301de8/taverna-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-ui/pom.xml b/taverna-ui/pom.xml
index 05c17f4..ccf48fb 100644
--- a/taverna-ui/pom.xml
+++ b/taverna-ui/pom.xml
@@ -1,34 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.sf.taverna.t2</groupId>
- <artifactId>lang</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <groupId>org.apache.taverna.workbench</groupId>
+ <artifactId>taverna-workbench</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>taverna-ui</artifactId>
<packaging>bundle</packaging>
- <name>User interface (Swing) utility classes</name>
+ <name>Apache Taverna User interface (Swing) utilities</name>
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>observer</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.taverna.engine</groupId>
+ <artifactId>taverna-observer</artifactId>
+ <version>${taverna.engine.version}</version>
</dependency>
+ <!--
<dependency>
<groupId>net.sf.taverna.jedit</groupId>
<artifactId>jedit-syntax</artifactId>
<version>${jedit.syntax.version}</version>
</dependency>
+ -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/49301de8/taverna-uibuilder/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-uibuilder/pom.xml b/taverna-uibuilder/pom.xml
index 4afa898..06caf91 100644
--- a/taverna-uibuilder/pom.xml
+++ b/taverna-uibuilder/pom.xml
@@ -1,24 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>net.sf.taverna.t2</groupId>
- <artifactId>lang</artifactId>
- <version>2.0.1-SNAPSHOT</version>
+ <groupId>org.apache.taverna.workbench</groupId>
+ <artifactId>taverna-workbench</artifactId>
+ <version>3.1.0-incubating-SNAPSHOT</version>
</parent>
<artifactId>taverna-uibuilder</artifactId>
<packaging>bundle</packaging>
- <name>UI builder based on beans</name>
+ <name>Apache Taverna UI builder</name>
<dependencies>
<dependency>
- <groupId>net.sf.taverna.t2.lang</groupId>
- <artifactId>ui</artifactId>
- <version>${project.version}</version>
+ <groupId>${parent.project.groupId}</groupId>
+ <artifactId>taverna-ui</artifactId>
+ <version>${parent.project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.log4j</groupId>
- <artifactId>com.springsource.org.apache.log4j</artifactId>
+ <groupId>log4j</groupId>
+ <artifactId>alog4j</artifactId>
<version>${log4j.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/49301de8/taverna-unrecognized-activity-ui/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-unrecognized-activity-ui/pom.xml b/taverna-unrecognized-activity-ui/pom.xml
index 05349a8..1b842b0 100644
--- a/taverna-unrecognized-activity-ui/pom.xml
+++ b/taverna-unrecognized-activity-ui/pom.xml
@@ -23,42 +23,19 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>unrecognized-activity-ui</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <artifactId>taverna-unrecognized-activity-ui</artifactId>
<packaging>bundle</packaging>
- <name>Taverna 2 Unrecognized Activity UI</name>
+ <name>Apache Taverna Unrecognized Activity UI</name>
<dependencies>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>configuration-api</artifactId>
+ <artifactId>taverna-configuration-api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>${project.parent.groupId}</groupId>
- <artifactId>contextual-views-impl</artifactId>
+ <artifactId>taverna-contextual-views-impl</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <releases />
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>mygrid-repository</id>
- <name>myGrid Repository</name>
- <url>http://www.mygrid.org.uk/maven/repository
- </url>
- </repository>
- <repository>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots />
- <id>mygrid-snapshot-repository</id>
- <name>myGrid Snapshot Repository</name>
- <url>http://www.mygrid.org.uk/maven/snapshot-repository</url>
- </repository>
- </repositories>
</project>
-
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/49301de8/taverna-workbench-activity-icons-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-activity-icons-api/pom.xml b/taverna-workbench-activity-icons-api/pom.xml
index ec9114e..2bf3ffc 100644
--- a/taverna-workbench-activity-icons-api/pom.xml
+++ b/taverna-workbench-activity-icons-api/pom.xml
@@ -23,14 +23,15 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>activity-icons-api</artifactId>
+ <artifactId>taverna-activity-icons-api</artifactId>
<packaging>bundle</packaging>
- <name>Activity icon manager API</name>
+ <name>Apache Taverna Activity icon manager API</name>
<dependencies>
<dependency>
<groupId>org.apache.taverna.language</groupId>
<artifactId>taverna-scufl2-api</artifactId>
+ <version>${taverna.language.version}</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-workbench/blob/49301de8/taverna-workbench-activity-palette-api/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-workbench-activity-palette-api/pom.xml b/taverna-workbench-activity-palette-api/pom.xml
index 6f21df4..b734099 100644
--- a/taverna-workbench-activity-palette-api/pom.xml
+++ b/taverna-workbench-activity-palette-api/pom.xml
@@ -23,7 +23,7 @@
<artifactId>taverna-workbench</artifactId>
<version>3.1.0-incubating-SNAPSHOT</version>
</parent>
- <artifactId>activity-palette-api</artifactId>
+ <artifactId>taverna-activity-palette-api</artifactId>
<packaging>bundle</packaging>
<name>Activity Palette API</name>
<description>Activity Palette API</description>