Author: dazarov
Date: 2008-06-26 11:44:55 -0400 (Thu, 26 Jun 2008)
New Revision: 8957
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamListLayout.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamListFigure.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1189
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-06-26
14:54:29 UTC (rev 8956)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-06-26
15:44:55 UTC (rev 8957)
@@ -244,6 +244,7 @@
public void notifyChanged(Notification notification) {
refresh();
refreshVisuals();
+ ((PagesDiagramEditPart)getParent().getRoot().getViewer().getEditPartRegistry().get(getPageModel().getParent())).refresh();
}
/**
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2008-06-26
14:54:29 UTC (rev 8956)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2008-06-26
15:44:55 UTC (rev 8957)
@@ -37,6 +37,7 @@
import org.eclipse.gef.tools.DeselectAllTracker;
import org.eclipse.gef.tools.MarqueeDragTracker;
import org.eclipse.swt.accessibility.AccessibleEvent;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModel;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesModelListener;
import org.jboss.tools.seam.ui.pages.editor.figures.DiagramFigure;
@@ -230,7 +231,19 @@
*
*/
protected List getModelChildren() {
- return getPagesModel().getChildren();
+ ArrayList list = new ArrayList();
+ for(int i = 0; i < getPagesModel().getChildren().size(); i++){
+ list.add(getPagesModel().getChildren().get(i));
+
+ if(getPagesModel().getChildren().get(i) instanceof Page){
+ Page page = (Page)getPagesModel().getChildren().get(i);
+ if(page.getChildren().size() > 0 && page.isParamsVisible()){
+ PageWrapper wrapper = new PageWrapper(page);
+ list.add(wrapper);
+ }
+ }
+ }
+ return list;
}
/**
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-06-26
14:54:29 UTC (rev 8956)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamEditPart.java 2008-06-26
15:44:55 UTC (rev 8957)
@@ -151,7 +151,7 @@
protected void refreshVisuals() {
- Point loc = getExceptionModel().getLocation();
+ Point loc = new Point(1,1);
String text = getExceptionModel().getName();
if(text == null) text="Param";
int width = getIconWidth()+FigureUtilities.getTextExtents(text,
NodeFigure.nodeLabelFont).width;
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java 2008-06-26
14:54:29 UTC (rev 8956)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ParamListEditPart.java 2008-06-26
15:44:55 UTC (rev 8957)
@@ -14,7 +14,6 @@
import java.util.List;
import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.FigureUtilities;
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
@@ -24,21 +23,16 @@
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.gef.AccessibleEditPart;
import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartListener;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
import org.eclipse.gef.requests.DropRequest;
import org.eclipse.swt.accessibility.AccessibleControlEvent;
import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Link;
-import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
-import org.jboss.tools.seam.ui.pages.editor.figures.ExceptionFigure;
import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure;
import org.jboss.tools.seam.ui.pages.editor.figures.ParamListFigure;
-public class ParamListEditPart extends PagesEditPart implements PropertyChangeListener,
EditPartListener, Adapter {
+public class ParamListEditPart extends PagesEditPart implements PropertyChangeListener,
Adapter {
private ParamListFigure fig = null;
private boolean single = true;
@@ -47,52 +41,7 @@
return single;
}
- public void doControlUp() {
- }
- public void doControlDown() {
- }
-
- public void doMouseHover(boolean cf) {
- }
-
- public void childAdded(EditPart child, int index) {
- }
-
- public void partActivated(EditPart editpart) {
- }
-
- public void partDeactivated(EditPart editpart) {
- }
-
- public void removingChild(EditPart child, int index) {
- }
-
- public void selectedStateChanged(EditPart editpart) {
- if (this.getSelected() == EditPart.SELECTED_PRIMARY) {
- ((PagesDiagramEditPart) ParamListEditPart.this.getParent())
- .setToFront(this);
-
- }
- }
-
- public boolean isGroupListenerEnable() {
- return true;
- }
-
-
-
- private void refreshTargetLink(Link link) {
- if (link == null)
- return;
- ParamListEditPart gep = (ParamListEditPart) getViewer().getEditPartRegistry()
- .get(link.getToElement());
- if (gep == null)
- return;
- gep.refreshTargetConnections();
- }
-
-
protected AccessibleEditPart createAccessible() {
return new AccessibleGraphicalEditPart() {
@@ -107,7 +56,7 @@
}
protected void createEditPolicies() {
- super.createEditPolicies();
+ //super.createEditPolicies();
installEditPolicy(EditPolicy.NODE_ROLE, null);
installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, null);
//installEditPolicy(EditPolicy.COMPONENT_ROLE, new PageEditPolicy());
@@ -142,14 +91,19 @@
protected void refreshVisuals() {
- Point loc = new Point(1,1);
- size = new Dimension(10, 10);
+ Point loc = getExceptionModel().getPage().getLocation().getCopy();
+ loc.y +=
25+getExceptionModel().getPage().getOutputLinks().size()*NodeFigure.LINK_HEIGHT;
+ size = new Dimension(200, getExceptionModel().getPage().getChildren().size()*19);
adjustForGrid(loc);
Rectangle r = new Rectangle(loc, size);
((GraphicalEditPart) getParent()).setLayoutConstraint(this,
getFigure(), r);
+
+ ((PagesDiagramEditPart) ParamListEditPart.this.getParent())
+ .setToFront(this);
+
}
public ConnectionAnchor getTargetConnectionAnchor(
@@ -178,7 +132,7 @@
protected void refreshChildren() {
super.refreshChildren();
for (int i = 0; i < getChildren().size(); i++) {
- ((ParamListEditPart) getChildren().get(i)).refresh();
+ ((ParamEditPart) getChildren().get(i)).refresh();
}
}
@@ -189,14 +143,14 @@
public void activate() {
if (isActive())
return;
- ((Notifier) getModel()).eAdapters().add(this);
+ ((Notifier) getExceptionModel().getPage()).eAdapters().add(this);
super.activate();
}
public void deactivate(){
if (!isActive())
return;
- ((Notifier) getModel()).eAdapters().remove(this);
+ ((Notifier) getExceptionModel().getPage()).eAdapters().remove(this);
super.deactivate();
}
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java 2008-06-26
14:54:29 UTC (rev 8956)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/NodeFigure.java 2008-06-26
15:44:55 UTC (rev 8957)
@@ -66,6 +66,9 @@
public static final Color button4Color = new Color(null, 0xdb, 0xc7, 0x68);
public static final Font nodeLabelFont = new Font(null, "default", 10,
SWT.BOLD); // TODO: use preference font mechanism for this
+
+ public static final Font nameParamFont = new Font(null, "default", 10,
SWT.BOLD); // TODO: use preference font mechanism for this
+ public static final Font valueParamFont = new Font(null, "default", 10,
SWT.NORMAL); // TODO: use preference font mechanism for this
public static final Image errorIcon = ModelUIImages
.getImage("error_co.gif");
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java 2008-06-26
14:54:29 UTC (rev 8956)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamFigure.java 2008-06-26
15:44:55 UTC (rev 8957)
@@ -11,26 +11,16 @@
package org.jboss.tools.seam.ui.pages.editor.figures;
import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.XYLayout;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.gef.handles.HandleBounds;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.jboss.tools.common.gef.GEFGraphicalViewer;
import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Param;
import org.jboss.tools.seam.ui.pages.editor.edit.ParamEditPart;
-import org.jboss.tools.seam.ui.pages.editor.figures.xpl.FixedConnectionAnchor;
public class ParamFigure extends NodeFigure implements HandleBounds {
private static final Dimension SIZE = new Dimension(56, 100);
- private Image icon = null;
-
public Param exc;
ParamEditPart editPart;
@@ -39,37 +29,10 @@
editPart = part;
}
- public void setConstraint(IFigure child, Object constraint) {
- super.setConstraint(child, constraint);
- }
-
- public void setIcon(Image i) {
- //icon = PrintIconHelper.getPrintImage(i);
- }
-
public ParamFigure(Param group) {
this.exc = group;
- setOpaque(false);
- setLayoutManager(new XYLayout());
-
- setBorder(new GroupBorder(blackColor));
-
- if (group != null) {
- FixedConnectionAnchor c;
- c = new FixedConnectionAnchor(this);
- c.offsetV = 10;
- //c.offsetH = -1;
- connectionAnchors.put("1_IN", c);
- inputConnectionAnchors.addElement(c);
-
- c = new FixedConnectionAnchor(this);
- c.offsetV = 10;
- c.offsetH = -1;
- c.leftToRight = false;
- connectionAnchors.put("1_OUT", c);
- outputConnectionAnchors.addElement(c);
- }
+ setOpaque(true);
}
/**
@@ -86,8 +49,6 @@
return SIZE;
}
- int width, height;
-
/**
* @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
*/
@@ -95,68 +56,21 @@
Rectangle r = getBounds().getCopy();
g.translate(r.getLocation());
- if (exc != null) {
- g.setBackgroundColor(exceptionBackgroundColor);
- g.setForegroundColor(exceptionForegroundColor);
- } else {
- g.setBackgroundColor(lightGrayColor);
- }
-
- g.fillRectangle(1, 1, r.width-2, r.height-2);
-
- g.setBackgroundColor(whiteColor);
-
- g.fillRectangle(1, 1, 22, 19);
-
- if (icon != null)
- g.drawImage(icon, 4, 2);
-
if(exc != null){
- g.setFont(nodeLabelFont);
+ g.setFont(nameParamFont);
if(exc.getName() != null)
- g.drawString(exc.getName(), 27, 3);
+ g.drawString(exc.getName()+":", 5, 1);
else
- g.drawString("Param", 27, 3);
- }
-
-
- }
-
- class GroupBorder extends LineBorder {
- public GroupBorder(Color color) {
- super(color);
- }
-
- public void paint(IFigure figure, Graphics graphics, Insets insets) {
- Rectangle r = getPaintRectangle(figure, insets).getCopy();
- graphics.translate(r.getLocation());
- int width = r.width - 1;
- int height = r.height - 1;
+ g.drawString("Param:", 5, 1);
- if (exc != null)
- graphics.setForegroundColor(blackColor);
+ g.setFont(valueParamFont);
+ if(exc.getValue() != null)
+ g.drawString(exc.getValue(), 105, 1);
else
- graphics.setForegroundColor(darkGrayColor);
+ g.drawString("value", 105, 1);
- graphics.drawLine(1, 0, width-1, 0);
- graphics.drawLine(0, 1, 0, height - 1);
- graphics.drawLine(1, height, width-1, height);
- graphics.drawLine(width, 1, width, height - 1);
- graphics.drawLine(23 , 0, 23, height);
-
-
- }
-
- public void mouseDoubleClicked(MouseEvent me) {
- }
-
- public void mousePressed(MouseEvent me) {
- if (me.button == 3) {
- ((GEFGraphicalViewer) editPart.getViewer()).setNoDeselect();
- editPart.getViewer().select(editPart);
}
- }
+
-
-}
+ }
}
\ No newline at end of file
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamListFigure.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamListFigure.java 2008-06-26
14:54:29 UTC (rev 8956)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamListFigure.java 2008-06-26
15:44:55 UTC (rev 8957)
@@ -14,7 +14,6 @@
import org.eclipse.draw2d.IFigure;
import org.eclipse.draw2d.LineBorder;
import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.XYLayout;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Rectangle;
@@ -52,7 +51,7 @@
this.paramList = paramList;
setOpaque(false);
- setLayoutManager(new XYLayout());
+ setLayoutManager(new ParamListLayout());
setBorder(new GroupBorder(blackColor));
}
@@ -77,13 +76,12 @@
* @see org.eclipse.draw2d.Figure#paintFigure(Graphics)
*/
protected void paintFigure(Graphics g) {
+ //g.setXORMode(true);
+ g.setBackgroundColor(lightGrayColor);
+
Rectangle r = getBounds().getCopy();
g.translate(r.getLocation());
-
- g.setXORMode(true);
- g.setBackgroundColor(lightGrayColor);
-
g.fillRectangle(1, 1, r.width-2, r.height-2);
}
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamListLayout.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamListLayout.java
(rev 0)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamListLayout.java 2008-06-26
15:44:55 UTC (rev 8957)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at
http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.seam.ui.pages.editor.figures;
+
+import org.eclipse.draw2d.AbstractLayout;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.swt.SWT;
+
+public class ParamListLayout extends AbstractLayout {
+
+ protected Dimension calculatePreferredSize(IFigure container, int wHint,
+ int hHint) {
+ return new Dimension(SWT.DEFAULT, SWT.DEFAULT);
+ }
+
+ /**
+ * @see org.eclipse.draw2d.LayoutManager#layout(org.eclipse.draw2d.IFigure)
+ */
+ public void layout(IFigure container) {
+ Rectangle bounds = container.getBounds();
+
+ int y = 0;
+
+ for (int i = 0; i < container.getChildren().size(); i++) {
+ IFigure figure = (IFigure) container.getChildren().get(i);
+ figure.setLocation(new Point(bounds.x + 5, bounds.y + y));
+ figure.setSize(container.getSize().width - 5, 19);
+ y += 19;
+ }
+ }
+}
Property changes on:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ParamListLayout.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain