JBoss Tools SVN: r18370 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors: autolayout/data and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-10-30 12:23:36 -0400 (Fri, 30 Oct 2009)
New Revision: 18370
Added:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/data/
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/data/DiagramElementInfo.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/data/DiagramInfo.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/data/LinkInfo.java
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/IDiagramInfo.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/IItemInfo.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/AutoLayoutImpl.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Group.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/GroupArranger.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Groups.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Item.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Items.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/TransitionArranger.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/DiagramEditPart.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5104 - fixed
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/IDiagramInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/IDiagramInfo.java 2009-10-30 16:19:46 UTC (rev 18369)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/IDiagramInfo.java 2009-10-30 16:23:36 UTC (rev 18370)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2007-2009 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,
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/IItemInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/IItemInfo.java 2009-10-30 16:19:46 UTC (rev 18369)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/IItemInfo.java 2009-10-30 16:23:36 UTC (rev 18370)
@@ -19,6 +19,7 @@
*/
public String getID();
public boolean isComment();
+ public boolean isVisible();
/**
* gets shape vertices
*/
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/data/DiagramElementInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/data/DiagramElementInfo.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/data/DiagramElementInfo.java 2009-10-30 16:23:36 UTC (rev 18370)
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.ui.diagram.editors.autolayout.data;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.draw2d.geometry.Point;
+import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.IItemInfo;
+import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.ILinkInfo;
+import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection;
+import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape;
+import org.jboss.tools.hibernate.ui.diagram.editors.model.Shape;
+
+/**
+ * @author some modifications from Vitali
+ */
+public class DiagramElementInfo implements IItemInfo {
+
+ protected OrmShape element;
+ protected List<ILinkInfo> links = new ArrayList<ILinkInfo>();
+ protected int cxFigure, cyFigure;
+
+ /**
+ *
+ * @param element
+ */
+ public DiagramElementInfo(OrmShape element, int cxFigure, int cyFigure) {
+ this.element = element;
+ this.cxFigure = cxFigure;
+ this.cyFigure = cyFigure;
+ ILinkInfo link;
+ for (Connection connection : element.getSourceConnections()) {
+ if (connection.isVisible()) {
+ link = new LinkInfo(connection);
+ addLink(link);
+ }
+ }
+ Iterator<Shape> it = element.getChildrenIterator();
+ while (it.hasNext()) {
+ Shape child = it.next();
+ if (!child.isVisible()) {
+ continue;
+ }
+ final List<Connection> sourceConnections = child.getSourceConnections();
+ if (sourceConnections.size() == 0) {
+ link = new LinkInfo(getID());
+ addLink(link);
+ }
+ for (Connection connection : sourceConnections) {
+ if (connection.isVisible()) {
+ link = new LinkInfo(connection);
+ addLink(link);
+ }
+ }
+ }
+ }
+
+ /**
+ *
+ */
+ public String getID() {
+ return element.toString();
+ }
+
+ /**
+ * there are no comments on Diagram Viewer!!!
+ */
+ public boolean isComment() {
+ return false;
+ }
+
+ public boolean isVisible() {
+ return element.isVisible();
+ }
+
+ /**
+ * gets shape vertices
+ */
+ public int[] getShape() {
+ int[] shape = new int[4];
+ shape[0] = element.getLocation().x;
+ shape[1] = element.getLocation().y;
+ shape[2] = cxFigure;
+ shape[3] = cyFigure;
+ return shape;
+ }
+
+ /**
+ * setup OrmShape up-left point location, using s[0] and s[1]
+ */
+ public void setShape(int[] s) {
+ element.setLocation(new Point(s[0], s[1]));
+ }
+
+ /**
+ *
+ */
+ public ILinkInfo[] getLinks() {
+ return links.toArray(new ILinkInfo[0]);
+ }
+
+ /**
+ *
+ * @param link
+ */
+ public void addLink(ILinkInfo link) {
+ links.add(link);
+ }
+
+}
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/data/DiagramInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/data/DiagramInfo.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/data/DiagramInfo.java 2009-10-30 16:23:36 UTC (rev 18370)
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.ui.diagram.editors.autolayout.data;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.EditPartViewer;
+import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.IDiagramInfo;
+import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.IItemInfo;
+import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmDiagram;
+import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape;
+import org.jboss.tools.hibernate.ui.diagram.editors.model.Shape;
+import org.jboss.tools.hibernate.ui.diagram.editors.parts.OrmShapeEditPart;
+
+/**
+ * @author some modifications from Vitali
+ */
+public class DiagramInfo implements IDiagramInfo {
+
+ protected List<IItemInfo> items = new ArrayList<IItemInfo>();
+ protected OrmDiagram diagram;
+ protected EditPartViewer viewer;
+
+ public DiagramInfo(EditPartViewer viewer, OrmDiagram diagram) {
+ this.viewer = viewer;
+ this.diagram = diagram;
+ Iterator<Shape> it = diagram.getChildrenIterator();
+ while (it.hasNext()) {
+ Shape child = it.next();
+ if (!(child instanceof OrmShape)) {
+ continue;
+ }
+ OrmShape ormShape = (OrmShape)child;
+ if (child.isVisible()) {
+ OrmShapeEditPart part = (OrmShapeEditPart)viewer
+ .getEditPartRegistry().get(ormShape);
+ // default values - indicate refresh model error
+ int cxFigure = 6000;
+ int cyFigure = 1000;
+ if (part != null) {
+ IFigure fig = part.getFigure();
+ //cxFigure = fig.getSize().width;
+ //cyFigure = fig.getSize().height;
+ // use preferred size for correct autolayout
+ cxFigure = fig.getPreferredSize().width;
+ cyFigure = fig.getPreferredSize().height;
+ }
+ IItemInfo item = new DiagramElementInfo(ormShape, cxFigure, cyFigure);
+ addItem(item);
+ } else {
+ // move invisible shapes to upper-left corner
+ ormShape.setLocation(new Point(0, 0));
+ }
+ }
+ }
+
+ /**
+ *
+ */
+ public IItemInfo[] getItems() {
+ return items.toArray(new IItemInfo[0]);
+ }
+
+ /**
+ *
+ * @param item
+ */
+ public void addItem(IItemInfo item) {
+ items.add(item);
+ }
+}
Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/data/LinkInfo.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/data/LinkInfo.java (rev 0)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/data/LinkInfo.java 2009-10-30 16:23:36 UTC (rev 18370)
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.hibernate.ui.diagram.editors.autolayout.data;
+
+import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.ILinkInfo;
+import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection;
+
+/**
+ * @author some modifications from Vitali
+ */
+public class LinkInfo implements ILinkInfo {
+
+ protected Connection link = null;
+
+ protected String id = null;
+
+ /**
+ *
+ * @param link
+ */
+ public LinkInfo(Connection link) {
+ this.link = link;
+ }
+
+ /**
+ *
+ * @param id
+ */
+ public LinkInfo(String id) {
+ this.id = id;
+ }
+
+ public String getTargetID() {
+ if (id != null) {
+ return id;
+ }
+ if (link.getTarget() != null) {
+ return link.getTarget().toString();
+ }
+ return ""; //$NON-NLS-1$
+ }
+}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/AutoLayoutImpl.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/AutoLayoutImpl.java 2009-10-30 16:19:46 UTC (rev 18369)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/AutoLayoutImpl.java 2009-10-30 16:23:36 UTC (rev 18370)
@@ -56,7 +56,11 @@
if (is[i].isSet()) {
continue;
}
- IItemInfo o = is[i].itemInfo;
+ IItemInfo itemInfo = is[i].getItemInfo();
+ if (!is[i].isVisible()) {
+ itemInfo.setShape(new int[]{0, 0, 0, 0});
+ continue;
+ }
int x = is[i].ix * constants.deltaX + constants.indentX;
int y = is[i].iy * constants.deltaY + constants.indentY;
if (is[i].ix % 2 == 1) {
@@ -64,7 +68,7 @@
}
x += is[i].group.xDeltas[is[i].ix] * constants.incX;
y += yDeltas[is[i].iy] * constants.incY + is[i].yIndent;
- o.setShape(new int[]{x, y, 0, 0});
+ itemInfo.setShape(new int[]{x, y, 0, 0});
}
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Group.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Group.java 2009-10-30 16:19:46 UTC (rev 18369)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Group.java 2009-10-30 16:23:36 UTC (rev 18370)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2007-2009 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,
@@ -13,6 +13,9 @@
import java.util.ArrayList;
import java.util.List;
+/**
+ * @author ?
+ */
public class Group {
LayoutConstants constants;
int number;
@@ -259,7 +262,7 @@
if (c >= xDeltas.length) {
continue;
}
- int[] shape = getItem(i).getObject().getShape();
+ int[] shape = getItem(i).getItemInfo().getShape();
if (shape == null || shape.length < 4) {
continue;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/GroupArranger.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/GroupArranger.java 2009-10-30 16:19:46 UTC (rev 18369)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/GroupArranger.java 2009-10-30 16:23:36 UTC (rev 18370)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2007-2009 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,
@@ -10,6 +10,9 @@
******************************************************************************/
package org.jboss.tools.hibernate.ui.diagram.editors.autolayout.impl;
+/**
+ * @author ?
+ */
public class GroupArranger {
Group group;
int mgi = 0; // items with indefinite gravity
@@ -116,7 +119,7 @@
Item i2 = group.allitems[item.inputs[input]];
int[] is = i2.outputs;
for (int i = 0; i < is.length; i++) {
- if (is[i] == item.n) {
+ if (is[i] == item.getId()) {
i2.outputActivities[i] = b;
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Groups.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Groups.java 2009-10-30 16:19:46 UTC (rev 18369)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Groups.java 2009-10-30 16:23:36 UTC (rev 18370)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2007-2009 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,
@@ -12,6 +12,9 @@
import java.util.*;
+/**
+ * @author ?
+ */
public class Groups {
protected LayoutConstants constants;
static int FX = 30, FY = 120;
@@ -79,7 +82,7 @@
}
}
for (int i = 0; i < items.length; i++) {
- if (items[i].isSet()) {
+ if (items[i].isSet() && items[i].isVisible()) {
field[items[i].ix][items[i].iy] = 1;
}
}
@@ -195,7 +198,7 @@
if (c >= xDeltas.length) {
continue;
}
- int[] shape = item.getObject().getShape();
+ int[] shape = item.getItemInfo().getShape();
if (shape == null || shape.length < 4) {
continue;
}
@@ -231,7 +234,7 @@
if (sz > yDeltas[c]) {
yDeltas[c] = sz;
}
- int[] shape = items[i].getObject().getShape();
+ int[] shape = items[i].getItemInfo().getShape();
if (shape == null || shape.length < 4) {
continue;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Item.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Item.java 2009-10-30 16:19:46 UTC (rev 18369)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Item.java 2009-10-30 16:23:36 UTC (rev 18370)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2007-2009 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,
@@ -15,10 +15,14 @@
import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.IItemInfo;
import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.ILinkInfo;
-
+/**
+ * Auto layout item.
+ */
public class Item {
- protected IItemInfo itemInfo;
- protected int n;
+
+ private int nId;
+ private IItemInfo itemInfo;
+
protected int x = 0;
protected int y = 0;
protected int ix = -1;
@@ -35,9 +39,21 @@
protected boolean isSet = false;
protected boolean yAssigned = false;
- public Item() {}
+ public Item(int nId, IItemInfo itemInfo) {
+ this.nId = nId;
+ this.itemInfo = itemInfo;
+ if (itemInfo != null && !itemInfo.isVisible()) {
+ isSet = true;
+ ix = 0;
+ iy = 0;
+ }
+ }
- public IItemInfo getObject() {
+ public int getId() {
+ return nId;
+ }
+
+ public IItemInfo getItemInfo() {
return itemInfo;
}
@@ -77,6 +93,10 @@
public boolean isComment() {
return itemInfo != null && itemInfo.isComment();
}
+
+ public boolean isVisible() {
+ return itemInfo != null && itemInfo.isVisible();
+ }
int gravity;
boolean[] outputActivities;
@@ -85,11 +105,11 @@
public void initActivities() {
outputActivities = new boolean[outputs.length];
for (int i = 0; i < outputActivities.length; i++) {
- outputActivities[i] = (outputs[i] != n);
+ outputActivities[i] = (outputs[i] != nId);
}
inputActivities = new boolean[inputs.length];
for (int i = 0; i < inputActivities.length; i++) {
- inputActivities[i] = (inputs[i] != n);
+ inputActivities[i] = (inputs[i] != nId);
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Items.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Items.java 2009-10-30 16:19:46 UTC (rev 18369)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/Items.java 2009-10-30 16:23:36 UTC (rev 18370)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2007-2009 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,
@@ -16,6 +16,9 @@
import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.ILinkInfo;
import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.IDiagramInfo;
+/**
+ * @author ?
+ */
public class Items {
protected LayoutConstants constants;
protected IDiagramInfo process;
@@ -55,11 +58,9 @@
IItemInfo[] is = process.getItems();
items = new Item[is.length];
for (int i = 0; i < is.length; i++) {
- Item item = new Item();
+ Item item = new Item(i, is[i]);
items[i] = item;
paths.put(is[i].getID(), item);
- item.n = i;
- item.itemInfo = is[i];
int[] shape = is[i].getShape();
if (!override && shape != null && shape.length > 1) {
item.x = shape[0];
@@ -107,8 +108,8 @@
private void buildBinds() {
for (int i = 0; i < items.length; i++) {
- ILinkInfo[] ts = (items[i].itemInfo instanceof ILinkInfo) ? new ILinkInfo[] { (ILinkInfo) items[i].itemInfo }
- : getOutput(items[i].itemInfo);
+ ILinkInfo[] ts = (items[i].getItemInfo() instanceof ILinkInfo) ? new ILinkInfo[] { (ILinkInfo) items[i].getItemInfo() }
+ : getOutput(items[i].getItemInfo());
for (int j = 0; j < ts.length; j++) {
String target = ts[j].getTargetID();
if (target == null || target.length() == 0) {
@@ -119,13 +120,13 @@
continue;
}
if (items[i].isComment()) {
- item2.addComment(items[i].n);
+ item2.addComment(items[i].getId());
items[i].isOwned = true;
} else if (item2.weight < 0) {
continue;
} else {
- item2.addInput(items[i].n, ts[j]);
- items[i].addOutput(item2.n);
+ item2.addInput(items[i].getId(), ts[j]);
+ items[i].addOutput(item2.getId());
}
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/TransitionArranger.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/TransitionArranger.java 2009-10-30 16:19:46 UTC (rev 18369)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/autolayout/impl/TransitionArranger.java 2009-10-30 16:23:36 UTC (rev 18370)
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Red Hat, Inc.
+ * Copyright (c) 2007-2009 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,
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/DiagramEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/DiagramEditPart.java 2009-10-30 16:19:46 UTC (rev 18369)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/DiagramEditPart.java 2009-10-30 16:23:36 UTC (rev 18370)
@@ -23,7 +23,6 @@
import org.eclipse.draw2d.ManhattanConnectionRouter;
import org.eclipse.draw2d.MarginBorder;
import org.eclipse.draw2d.XYLayout;
-import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.CompoundSnapToHelper;
import org.eclipse.gef.DefaultEditDomain;
import org.eclipse.gef.EditPart;
@@ -35,14 +34,11 @@
import org.eclipse.gef.SnapToHelper;
import org.eclipse.gef.rulers.RulerProvider;
import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer;
-import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.IItemInfo;
-import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.ILinkInfo;
import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.IDiagramInfo;
+import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.data.DiagramInfo;
import org.jboss.tools.hibernate.ui.diagram.editors.autolayout.impl.AutoLayoutImpl;
-import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection;
import org.jboss.tools.hibernate.ui.diagram.editors.model.BaseElement;
import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmDiagram;
-import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape;
import org.jboss.tools.hibernate.ui.diagram.editors.model.Shape;
/**
@@ -62,6 +58,9 @@
ConnectionLayer connLayer = (ConnectionLayer) getLayer(LayerConstants.CONNECTION_LAYER);
connLayer.setConnectionRouter(new ManhattanConnectionRouter());
+ //connLayer.setConnectionRouter(new ShortestPathConnectionRouter());
+ //connLayer.setConnectionRouter(new BendpointConnectionRouter());
+ //connLayer.setConnectionRouter(new FanRouter());
return f;
}
@@ -112,7 +111,7 @@
}
public void autolayout() {
- IDiagramInfo process = new DiagramInfo(getOrmDiagram());
+ IDiagramInfo process = new DiagramInfo(getViewer(), getOrmDiagram());
AutoLayoutImpl layout = new AutoLayoutImpl();
layout.setGridStep(5);
layout.setOverride(true);
@@ -136,172 +135,6 @@
}
}
- class DiagramInfo implements IDiagramInfo {
-
- List<IItemInfo> items = new ArrayList<IItemInfo>();
- OrmDiagram diagram;
-
- public DiagramInfo(OrmDiagram diagram) {
- this.diagram = diagram;
- Iterator<Shape> it = diagram.getChildrenIterator();
- while (it.hasNext()) {
- Shape child = it.next();
- if (child.isVisible() && (child instanceof OrmShape)) {
- IItemInfo item = new DiagramElementInfo((OrmShape)child);
- addItem(item);
- }
- }
- }
-
- /**
- *
- */
- public IItemInfo[] getItems() {
- return items.toArray(new IItemInfo[0]);
- }
-
- /**
- *
- * @param item
- */
- public void addItem(IItemInfo item) {
- items.add(item);
- }
- }
-
- class DiagramElementInfo implements IItemInfo {
- OrmShape element;
-
- List<ILinkInfo> links = new ArrayList<ILinkInfo>();
-
- /**
- *
- * @param element
- */
- public DiagramElementInfo(OrmShape element) {
- ILinkInfo link;
- this.element = element;
- for (Connection connection : element.getSourceConnections()) {
- if (connection.isVisible()) {
- link = new LinkInfo(connection);
- addLink(link);
- }
- }
- Iterator<Shape> it = element.getChildrenIterator();
- while (it.hasNext()) {
- Shape child = it.next();
- if (!child.isVisible()) {
- continue;
- }
- final List<Connection> sourceConnections = child.getSourceConnections();
- if (sourceConnections.size() == 0) {
- link = new LinkInfo(getID());
- addLink(link);
- }
- for (Connection connection : sourceConnections) {
- if (connection.isVisible()) {
- link = new LinkInfo(connection);
- addLink(link);
- }
- }
- }
- }
-
- /**
- *
- */
- public String getID() {
- return element.toString();
- }
-
- /**
- *
- */
- public boolean isComment() {
- return false;
- }
-
- /**
- * gets shape vertices
- */
- public int[] getShape() {
- int[] shape = new int[4];
- shape[0] = element.getLocation().x;
- shape[1] = element.getLocation().y;
- OrmShapeEditPart part = (OrmShapeEditPart) getViewer()
- .getEditPartRegistry().get(element);
- if (part != null) {
- IFigure fig = part.getFigure();
- //shape[2] = fig.getSize().width;
- //shape[3] = fig.getSize().height;
- // use preferred size for correct autolayout
- shape[2] = fig.getPreferredSize().width;
- shape[3] = fig.getPreferredSize().height;
- } else {
- // indicate refresh model error
- shape[2] = 6000;
- shape[3] = 1000;
- }
- return shape;
- }
-
- /**
- * setup OrmShape up-left point location, using s[0] and s[1]
- */
- public void setShape(int[] s) {
- element.setLocation(new Point(s[0], s[1]));
- }
-
- /**
- *
- */
- public ILinkInfo[] getLinks() {
- return links.toArray(new ILinkInfo[0]);
- }
-
- /**
- *
- * @param link
- */
- public void addLink(ILinkInfo link) {
- links.add(link);
- }
-
- }
-
- class LinkInfo implements ILinkInfo {
- Connection link = null;
-
- String id = null;
-
- /**
- *
- * @param link
- */
- public LinkInfo(Connection link) {
- this.link = link;
- }
-
- /**
- *
- * @param id
- */
- public LinkInfo(String id) {
- this.id = id;
- }
-
- public String getTargetID() {
- if (id != null) {
- return id;
- }
- if (link.getTarget() != null) {
- return link.getTarget().toString();
- }
- return ""; //$NON-NLS-1$
- }
- }
-
-
/**
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
14 years, 5 months
JBoss Tools SVN: r18369 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2009-10-30 12:19:46 -0400 (Fri, 30 Oct 2009)
New Revision: 18369
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5105/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5105/BrMozDirty.html
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MozDirtyTest_JBIDE5105.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/compositionWithTaglibs.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/datascroller.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/text/pre.html.xml
Log:
issue JBIDE-5105: Move initialization and reinitialization of editor before building visual tree.
https://jira.jboss.org/jira/browse/JBIDE-5105
- now initialization and reinitialization made before any visual node is created
- JUnit for the issue created
- JUnits with BR _MOZ_DIRTY corrected
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/compositionWithTaglibs.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/compositionWithTaglibs.xhtml.xml 2009-10-30 16:07:36 UTC (rev 18368)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/resources/faceletsTest/WebContent/pages/components/compositionWithTaglibs.xhtml.xml 2009-10-30 16:19:46 UTC (rev 18369)
@@ -45,8 +45,6 @@
<TR>
<TD WIDTH="100%" VALIGN="bottom" HEIGHT="1" BGCOLOR="#cad6e0"
COLSPAN="2">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
-
</TD>
</TR>
</TBODY>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml 2009-10-30 16:07:36 UTC (rev 18368)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3144/jbide3214test.xhtml.xml 2009-10-30 16:19:46 UTC (rev 18369)
@@ -19,28 +19,23 @@
<TBODY HEIGHT="100px;" STYLE="background-color: blue;" WIDTH="100px;">
</TBODY>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
-<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/>
-
+<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell">
</TD>
</TR>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
-<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/>
-
+<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell">
</TD>
</TR>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
-<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/>
-
+<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell">
</TD>
</TR>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
-<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/>
-
+<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell">
</TD>
</TR>
<TR CLASS="dr-table-firstrow rich-table-firstrow">
-<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell"><BR _MOZ_DIRTY="" TYPE="_moz"/>
-
+<TD STYLE="background-color: rgb(160, 32, 240);" CLASS="dr-table-cell rich-table-cell">
</TD>
</TR>
</TABLE>
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5105/BrMozDirty.html
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5105/BrMozDirty.html (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5105/BrMozDirty.html 2009-10-30 16:19:46 UTC (rev 18369)
@@ -0,0 +1,7 @@
+<html>
+ <body>
+ <table>
+ <tr><td></td></tr>
+ </table>
+ </body>
+</html>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml 2009-10-30 16:07:36 UTC (rev 18368)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/dataTable.jsp.xml 2009-10-30 16:19:46 UTC (rev 18369)
@@ -6,7 +6,6 @@
<DIV>
<TABLE>
<CAPTION>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
</CAPTION>
<TBODY>
<TR>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-10-30 16:07:36 UTC (rev 18368)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-10-30 16:19:46 UTC (rev 18369)
@@ -69,6 +69,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.MozDirtyTest_JBIDE5105;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.VpeI18nTest_JBIDE4887;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1467Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1501Test;
@@ -103,6 +104,7 @@
TestSuite suite = new TestSuite("Tests for Vpe Jsf components"); //$NON-NLS-1$
// $JUnit-BEGIN$
+ suite.addTestSuite(MozDirtyTest_JBIDE5105.class);
suite.addTestSuite(VpeI18nTest_JBIDE4887.class);
suite.addTestSuite(JsfComponentTest.class);
suite.addTestSuite(Jsf20ComponentContentTest.class);
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MozDirtyTest_JBIDE5105.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MozDirtyTest_JBIDE5105.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/MozDirtyTest_JBIDE5105.java 2009-10-30 16:19:46 UTC (rev 18369)
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 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
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.editor.util.HTML;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.interfaces.nsIDOMNodeList;
+
+/**
+ * Tests for _MOZ_DIRTY tags.
+ * See <a href="https://jira.jboss.org/jira/browse/JBIDE-5105">JBIDE-5105</a>.
+ *
+ * @author yradtsevich
+ *
+ */
+public class MozDirtyTest_JBIDE5105 extends VpeTest {
+ private static final String MOZ_DIRTY = "_MOZ_DIRTY"; //$NON-NLS-1$
+ private static final String TEST_PAGE_NAME
+ = "JBIDE/5105/BrMozDirty.html"; //$NON-NLS-1$
+
+ public MozDirtyTest_JBIDE5105(String name) {
+ super(name);
+ }
+
+ /**
+ * Test if there are no BR tags with _MOZ_DIRTY attribute.
+ * See
+ * <a href="https://jira.jboss.org/jira/browse/JBIDE-5105">JBIDE-5105</a>.
+ *
+ * @throws Throwable
+ */
+ public void testBrMozDirty() throws Throwable {
+ VpeController vpeController = openInVpe(JsfAllTests.IMPORT_PROJECT_NAME,
+ TEST_PAGE_NAME);
+
+ TestUtil.waitForIdle();
+ assertFalse(MOZ_DIRTY + " element detected before refresh.",//$NON-NLS-1$
+ hasBrMozDirty(vpeController));
+
+ vpeController.visualRefresh();
+ TestUtil.waitForIdle();
+ assertFalse(MOZ_DIRTY + " element detected after refresh.", //$NON-NLS-1$
+ hasBrMozDirty(vpeController));
+ }
+
+ private boolean hasBrMozDirty(VpeController vpeController) {
+ nsIDOMNodeList brNodeList = vpeController.getXulRunnerEditor()
+ .getDOMDocument().getElementsByTagName(HTML.TAG_BR);
+ for (int i = 0; i < brNodeList.getLength(); i++) {
+ nsIDOMNode brNode = brNodeList.item(i);
+ if (brNode.getAttributes().getNamedItem(MOZ_DIRTY) != null) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml 2009-10-30 16:07:36 UTC (rev 18368)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/dataTable.xhtml.xml 2009-10-30 16:19:46 UTC (rev 18369)
@@ -28,10 +28,8 @@
</THEAD>
<TFOOT>
<TR CLASS="dr-table-footer rich-table-footer">
+ <TD CLASS="dr-table-footercell rich-table-footercell"></TD>
<TD CLASS="dr-table-footercell rich-table-footercell">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
- </TD>
- <TD CLASS="dr-table-footercell rich-table-footercell">
<SPAN> footer1</SPAN>
</TD>
<TD CLASS="dr-table-footercell rich-table-footercell">
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/datascroller.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/datascroller.xhtml.xml 2009-10-30 16:07:36 UTC (rev 18368)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/datascroller.xhtml.xml 2009-10-30 16:19:46 UTC (rev 18369)
@@ -8,7 +8,6 @@
<TD ALIGN="center" CLASS="rich-datascr-button rich-datascr-button-dsbld">««</TD>
<TD ALIGN="center" CLASS="rich-datascr-button rich-datascr-button-dsbld">«</TD>
<TD ALIGN="center" CLASS="rich-datascr-button rich-datascr-button-dsbld">
- <BR _MOZ_DIRTY="" TYPE="_moz"/>
</TD>
<TD ALIGN="center" CLASS="rich-datascr-act"> 1</TD>
<TD ALIGN="center" CLASS="rich-datascr-inact"> 2</TD>
@@ -21,7 +20,6 @@
<TD ALIGN="center" CLASS="rich-datascr-inact"> 9</TD>
<TD ALIGN="center" CLASS="rich-datascr-inact"> 10</TD>
<TD ALIGN="center" CLASS="rich-datascr-button">
- <BR _MOZ_DIRTY="" TYPE="_moz"/>
</TD>
<TD ALIGN="center" CLASS="rich-datascr-button">»</TD>
<TD ALIGN="center" CLASS="rich-datascr-button">»»</TD>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml 2009-10-30 16:07:36 UTC (rev 18368)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/extendedDataTable.xhtml.xml 2009-10-30 16:19:46 UTC (rev 18369)
@@ -39,13 +39,11 @@
</SPAN>
</TH>
<TH CLASS="dr-table-subheadercell rich-table-subheadercell">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
</TH>
</TR>
<TR CLASS="dr-table-subheader rich-table-subheader">
<TD CLASS="dr-table-subheadercell rich-table-subheadercell"
SCOP="col">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
<TD CLASS="dr-table-subheadercell rich-table-subheadercell"
SCOP="col">
@@ -61,10 +59,8 @@
</TD>
<TD CLASS="dr-table-subheadercell rich-table-subheadercell"
SCOP="col">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
<TD CLASS="dr-table-subheadercell rich-table-subheadercell">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
</TR>
</THEAD>
@@ -73,26 +69,21 @@
<TD
CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter"
SCOP="col">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
<TD
CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter"
SCOP="col">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
<TD
CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter"
SCOP="col">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
<TD
CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter"
SCOP="col">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
<TD
CLASS="dr-table-subfootercell rich-table-subfootercell dr-table-subfooter rich-table-subfooter">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
</TR>
</TFOOT>
@@ -134,7 +125,6 @@
<TD WIDTH="17px" ALIGN="right">
<DIV STYLE="overflow: scroll; width: 17px; height: 100%;">
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
</TR>
</TBODY>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml 2009-10-30 16:07:36 UTC (rev 18368)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/orderingList.xhtml.xml 2009-10-30 16:19:46 UTC (rev 18369)
@@ -42,14 +42,12 @@
<TD>
<DIV STYLE="overflow: scroll; width: 17px; height: 100%;">
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz"/>
</TD>
</TR>
<TR>
<TD>
<DIV STYLE="overflow: scroll; width: 100%; height: 17px;">
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz"/>
</TD>
</TR>
</TABLE>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml 2009-10-30 16:07:36 UTC (rev 18368)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/pickList.xhtml.xml 2009-10-30 16:19:46 UTC (rev 18369)
@@ -89,14 +89,10 @@
CLASS="rich-picklist-body">
<TR>
<TD STYLE="border: 0px none ; padding: 0px;">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
-
</TD>
</TR>
</TABLE>
</DIV>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
-
</TD>
</TR>
</TBODY>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml 2009-10-30 16:07:36 UTC (rev 18368)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components/toolBar.xhtml.xml 2009-10-30 16:19:46 UTC (rev 18369)
@@ -48,7 +48,6 @@
</TABLE>
</TD>
<TD WIDTH="100%">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
</TD>
<TD CLASS="dr-toolbar-int rich-toolbar-item" STYLE="padding: 0px;">
<TABLE
@@ -116,8 +115,6 @@
</TABLE>
</TD>
<TD WIDTH="100%">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
-
</TD>
<TD CLASS="dr-toolbar-int rich-toolbar-item btn" STYLE="padding: 0px;">
<TABLE
@@ -268,8 +265,6 @@
</TABLE>
</TD>
<TD WIDTH="100%">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
-
</TD>
<TD CLASS="dr-toolbar-int rich-toolbar-item"
STYLE="padding: 0px; color: PaleVioletRed; font-size: medium; font-style: italic; background-color: FloralWhite; font-family: Arial TUR; font-weight: bolder;">
@@ -430,8 +425,6 @@
</TABLE>
</TD>
<TD>
- <BR _MOZ_DIRTY="" TYPE="_moz" />
-
</TD>
<TD CLASS="dr-toolbar-int rich-toolbar-item btn"
STYLE="padding: 0px; color: PaleVioletRed; font-size: medium; font-style: italic; background-color: FloralWhite; font-family: Arial TUR; font-weight: bolder;">
@@ -456,8 +449,6 @@
</TABLE>
</TD>
<TD WIDTH="100%">
- <BR _MOZ_DIRTY="" TYPE="_moz" />
-
</TD>
<TD CLASS="dr-toolbar-int rich-toolbar-item btn"
STYLE="padding: 0px; color: PaleVioletRed; font-size: medium; font-style: italic; background-color: FloralWhite; font-family: Arial TUR; font-weight: bolder;">
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-10-30 16:07:36 UTC (rev 18368)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2009-10-30 16:19:46 UTC (rev 18369)
@@ -2728,10 +2728,15 @@
private void reinitImpl() {
try {
- if(switcher==null||!switcher
- .startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_SOURCE)) {
- return;
+ if(switcher==null ||
+ !switcher.startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_SOURCE)) {
+ return;
}
+
+ // this method must be invoked before any visual
+ // node is created, see JBIDE-5105
+ visualEditor.reinitDesignMode();
+
visualBuilder.setSelectionRectangle(null);
visualEditor.setEditorDomEventListener(this);
IDOMModel sourceModel = (IDOMModel) getModel();
@@ -2742,7 +2747,6 @@
visualBuilder.rebuildDom(null);
}
//reinits selection controller+ controller
- visualEditor.reinitDesignMode();
visualSelectionController = new VpeSelectionController(visualEditor.getEditor().getSelectionController());
selectionBuilder = new VpeSelectionBuilder(domMapping, sourceBuilder,
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-10-30 16:07:36 UTC (rev 18368)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2009-10-30 16:19:46 UTC (rev 18369)
@@ -909,6 +909,11 @@
toolBar = visualEditor.createVisualToolbar(verticalToolbarSplitter);
visualEditor.createPartControl(visualContent);
+
+ // initialize editor
+ // this method must be invoked before any visual
+ // node is created, see JBIDE-5105
+ visualEditor.getEditor();
}
public void createPreviewBrowser() {
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml.xml 2009-10-30 16:07:36 UTC (rev 18368)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/other/xmp.xhtml.xml 2009-10-30 16:19:46 UTC (rev 18369)
@@ -1,48 +1,27 @@
<tests>
<test id="xmp">
<XMP ID="xmp" STYLE="-moz-user-modify: read-only;" >
-<SPAN><BR _MOZ_DIRTY=""/>
-
-while (<>) {<BR _MOZ_DIRTY=""/>
-
-$org=$_;<BR _MOZ_DIRTY=""/>
-
-s/\\["']//g;<BR _MOZ_DIRTY=""/>
-
-s/\/\/[^:].*//;<BR _MOZ_DIRTY=""/>
-
-s/\/\*.*\*\///g;<BR _MOZ_DIRTY=""/>
-
-if ($comment == 1) {<BR _MOZ_DIRTY=""/>
-
-if (s/.*\*\///) {<BR _MOZ_DIRTY=""/>
-
-$comment = 0;<BR _MOZ_DIRTY=""/>
-
-}<BR _MOZ_DIRTY=""/>
-
-else {<BR _MOZ_DIRTY=""/>
-
-next;<BR _MOZ_DIRTY=""/>
-
-}<BR _MOZ_DIRTY=""/>
-
-}<BR _MOZ_DIRTY=""/>
-
-if (s/\/\*.*//) {<BR _MOZ_DIRTY=""/>
-
-$comment = 1;<BR _MOZ_DIRTY=""/>
-
-}<BR _MOZ_DIRTY=""/>
-
-if (/^\s*#/) {<BR _MOZ_DIRTY=""/>
-
-next;<BR _MOZ_DIRTY=""/>
-
-}<BR _MOZ_DIRTY=""/>
-
-}<BR _MOZ_DIRTY=""/>
-
+<SPAN>
+while (<>) {
+ $org=$_;
+ s/\\["']//g;
+ s/\/\/[^:].*//;
+ s/\/\*.*\*\///g;
+ if ($comment == 1) {
+ if (s/.*\*\///) {
+ $comment = 0;
+ }
+ else {
+ next;
+ }
+ }
+ if (s/\/\*.*//) {
+ $comment = 1;
+ }
+ if (/^\s*#/) {
+ next;
+ }
+ }
</SPAN>
</XMP>
</test>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/text/pre.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/text/pre.html.xml 2009-10-30 16:07:36 UTC (rev 18368)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/text/pre.html.xml 2009-10-30 16:19:46 UTC (rev 18369)
@@ -3,14 +3,8 @@
<PRE WIDTH="30" ID="pre" CLASS="preClass"
STYLE="color: red; -moz-user-modify: read-write;">
<SPAN CLASS="vpe-text">
- <BR _MOZ_DIRTY="" />
-
- string 1
- <BR _MOZ_DIRTY="" />
-
- string 2
- <BR _MOZ_DIRTY="" />
-
+ string 1
+ string 2
</SPAN>
</PRE>
</test>
14 years, 5 months
JBoss Tools SVN: r18367 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-10-30 09:21:33 -0400 (Fri, 30 Oct 2009)
New Revision: 18367
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4956 - fix JUnit tests
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java 2009-10-30 12:59:48 UTC (rev 18366)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java 2009-10-30 13:21:33 UTC (rev 18367)
@@ -55,7 +55,9 @@
@SuppressWarnings("unchecked")
public void createForeingKeyConnections() {
- Iterator<OrmShape> it = elements.values().iterator();
+ // do clone cause elements could be changed during iteration!
+ HashMap<String, OrmShape> elementsTmp = (HashMap<String, OrmShape>)elements.clone();
+ Iterator<OrmShape> it = elementsTmp.values().iterator();
while (it.hasNext()) {
final OrmShape shape = it.next();
Object ormElement = shape.getOrmElement();
14 years, 5 months
JBoss Tools SVN: r18366 - trunk/documentation/guides/GettingStartedGuide/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2009-10-30 08:59:48 -0400 (Fri, 30 Oct 2009)
New Revision: 18366
Modified:
trunk/documentation/guides/GettingStartedGuide/en/modules/project_examples.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-919 JBoss Tools/Project Examples item is added to Examples category - mentiond in GSG
Modified: trunk/documentation/guides/GettingStartedGuide/en/modules/project_examples.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en/modules/project_examples.xml 2009-10-30 12:52:47 UTC (rev 18365)
+++ trunk/documentation/guides/GettingStartedGuide/en/modules/project_examples.xml 2009-10-30 12:59:48 UTC (rev 18366)
@@ -88,7 +88,7 @@
<para>Go to the menu bar and select <emphasis><property>File > New > Other...</property></emphasis>
</para></listitem>
- <listitem><para>Select <emphasis><property>Jboss Tools > Project Examples</property></emphasis>(You can also call the <emphasis><property>Project Examples</property></emphasis> from menu bar: <property>Help > Project Examples...</property>)</para></listitem>
+ <listitem><para>Select <emphasis><property>Jboss Tools > Project Examples</property></emphasis> (You can also call the <emphasis><property>Project Examples</property></emphasis> from menu bar: <property>Help > Project Examples...</property> or directly from <emphasis><property>File > New > Example...</property></emphasis> menu )</para></listitem>
</itemizedlist>
14 years, 5 months
JBoss Tools SVN: r18365 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2009-10-30 08:52:47 -0400 (Fri, 30 Oct 2009)
New Revision: 18365
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-1719, resizing was added for h:SelectManyMenu and h:selectManyListbox.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2009-10-30 02:02:39 UTC (rev 18364)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2009-10-30 12:52:47 UTC (rev 18365)
@@ -455,6 +455,10 @@
<vpe:tag name="h:selectManyListbox" case-sensitive="yes">
<vpe:template children="yes" modify="yes"
class="org.jboss.tools.jsf.vpe.jsf.template.JsfSelectManyListbox">
+ <vpe:resize>
+ <vpe:width width-attr="style.width" />
+ <vpe:height height-attr="style.height" />
+ </vpe:resize>
<vpe:dnd>
<vpe:drag start-enable="yes" />
<vpe:drop container="yes">
@@ -498,6 +502,10 @@
<vpe:container-child tag-name="selectItems" />
</vpe:drop>
</vpe:dnd>
+ <vpe:resize>
+ <vpe:width width-attr="style.width" />
+ <vpe:height height-attr="style.height" />
+ </vpe:resize>
<vpe:textFormatting use-default-formats="yes">
</vpe:textFormatting>
</vpe:template>
14 years, 5 months
JBoss Tools SVN: r18364 - in trunk: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-10-29 22:02:39 -0400 (Thu, 29 Oct 2009)
New Revision: 18364
Added:
trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ErrorRoot.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java
Log:
various cleanup
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-10-30 01:03:07 UTC (rev 18363)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-10-30 02:02:39 UTC (rev 18364)
@@ -147,46 +147,6 @@
}
}
- protected int countChanges(IModuleResourceDelta[] deltas) {
- IModuleResource res;
- int count = 0;
- if( deltas == null ) return 0;
- for( int i = 0; i < deltas.length; i++ ) {
- res = deltas[i].getModuleResource();
- if( res != null && res instanceof IModuleFile)
- count++;
- count += countChanges(deltas[i].getAffectedChildren());
- }
- return count;
- }
-
- protected int countConcreteFiles(IModule module) {
- PackagedModuleDelegate delegate = (PackagedModuleDelegate)module.loadAdapter(PackagedModuleDelegate.class, new NullProgressMonitor());
- try {
- ArrayList<IPath> list = new ArrayList<IPath>();
- countConcreteFiles(delegate.members()[0], list);
- return list.size();
- } catch( CoreException ce ) {
-
- }
- return -1;
- }
- protected void countConcreteFiles(IModuleResource mr, ArrayList<IPath> list) {
- if( mr instanceof IExtendedModuleResource) {
- IExtendedModuleResource emr = ((IExtendedModuleResource)mr);
- if( mr instanceof IModuleFile ) {
- IPath p = emr.getConcreteDestFile();
- if( !list.contains(p))
- list.add(p);
- }
- if( mr instanceof IModuleFolder) {
- IModuleResource[] children = ((IModuleFolder)mr).members();
- for( int i = 0; i < children.length; i++ )
- countConcreteFiles(children[i], list);
- }
- }
- }
-
protected void publishFromDeltaHandle(IModuleResourceDelta delta, IPath destRoot,
IPath sourcePrefix, ArrayList<IPath> changedFiles) {
switch( delta.getKind()) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java 2009-10-30 01:03:07 UTC (rev 18363)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/jmx/JBossServerConnection.java 2009-10-30 02:02:39 UTC (rev 18364)
@@ -28,6 +28,7 @@
import org.jboss.tools.jmx.core.IConnectionWrapper;
import org.jboss.tools.jmx.core.IJMXRunnable;
import org.jboss.tools.jmx.core.JMXException;
+import org.jboss.tools.jmx.core.tree.ErrorRoot;
import org.jboss.tools.jmx.core.tree.NodeUtils;
import org.jboss.tools.jmx.core.tree.Root;
@@ -74,6 +75,7 @@
} catch( CoreException ce ) {
IStatus status = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID, ce.getMessage(), ce);
JBossServerCorePlugin.getDefault().getLog().log(status);
+ root = new ErrorRoot();
} finally {
JMXClassLoaderRepository.getDefault().removeConcerned(server, this);
isLoading = false;
Added: trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ErrorRoot.java
===================================================================
--- trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ErrorRoot.java (rev 0)
+++ trunk/jmx/plugins/org.jboss.tools.jmx.core/src/org/jboss/tools/jmx/core/tree/ErrorRoot.java 2009-10-30 02:02:39 UTC (rev 18364)
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2009 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:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jmx.core.tree;
+
+/**
+ * This class is used to signify the true root could
+ * not be loaded.
+ *
+ * @author rob
+ */
+public class ErrorRoot extends Root {
+ public ErrorRoot() {
+ super(null);
+ }
+}
14 years, 5 months
JBoss Tools SVN: r18363 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-10-29 21:03:07 -0400 (Thu, 29 Oct 2009)
New Revision: 18363
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java
Log:
JBIDE-5049 - removed JRE tab as it was deemed useless
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2009-10-30 00:59:32 UTC (rev 18362)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2009-10-30 01:03:07 UTC (rev 18363)
@@ -55,8 +55,6 @@
tabs[i++].setLaunchConfigurationDialog(dialog);
tabs[i] = new EnvironmentTab();
tabs[i++].setLaunchConfigurationDialog(dialog);
- tabs[i] = new JavaJRETab();
- tabs[i++].setLaunchConfigurationDialog(dialog);
tabs[i] = new CommonTab();
tabs[i++].setLaunchConfigurationDialog(dialog);
14 years, 5 months
JBoss Tools SVN: r18362 - in trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core: test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-10-29 20:59:32 -0400 (Thu, 29 Oct 2009)
New Revision: 18362
Added:
trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/
trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/PortletCoreTestSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/PortletPluginsLoadTest.java
Removed:
trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/PortletCoreTestSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/PortletPluginsLoadTest.java
Log:
portletCore test error 'Class not found "org.jboss.tools.portlet.core.test.PortletCoreTestSuite"' waas fixed
Deleted: trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/PortletCoreTestSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/PortletCoreTestSuite.java 2009-10-29 22:34:21 UTC (rev 18361)
+++ trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/PortletCoreTestSuite.java 2009-10-30 00:59:32 UTC (rev 18362)
@@ -1,12 +0,0 @@
-package org.jboss.tools.portlet.core;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class PortletCoreTestSuite {
- public static Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTestSuite(PortletPluginsLoadTest.class);
- return suite;
- }
-}
Deleted: trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/PortletPluginsLoadTest.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/PortletPluginsLoadTest.java 2009-10-29 22:34:21 UTC (rev 18361)
+++ trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/PortletPluginsLoadTest.java 2009-10-30 00:59:32 UTC (rev 18362)
@@ -1,10 +0,0 @@
-package org.jboss.tools.portlet.core;
-
-import org.jboss.tools.tests.AbstractPluginsLoadTest;
-
-public class PortletPluginsLoadTest extends AbstractPluginsLoadTest {
-
- public void testPortlrtPlugisAreResolvedAndActivated() {
- testBundlesAreLoadedFor("org.jboss.tools.portlet.feature");
- }
-}
Copied: trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/PortletCoreTestSuite.java (from rev 18220, trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/PortletCoreTestSuite.java)
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/PortletCoreTestSuite.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/PortletCoreTestSuite.java 2009-10-30 00:59:32 UTC (rev 18362)
@@ -0,0 +1,12 @@
+package org.jboss.tools.portlet.core.test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class PortletCoreTestSuite {
+ public static Test suite() {
+ TestSuite suite = new TestSuite();
+ suite.addTestSuite(PortletPluginsLoadTest.class);
+ return suite;
+ }
+}
Property changes on: trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/PortletCoreTestSuite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/PortletPluginsLoadTest.java (from rev 18220, trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/PortletPluginsLoadTest.java)
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/PortletPluginsLoadTest.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/PortletPluginsLoadTest.java 2009-10-30 00:59:32 UTC (rev 18362)
@@ -0,0 +1,10 @@
+package org.jboss.tools.portlet.core.test;
+
+import org.jboss.tools.tests.AbstractPluginsLoadTest;
+
+public class PortletPluginsLoadTest extends AbstractPluginsLoadTest {
+
+ public void testPortlrtPlugisAreResolvedAndActivated() {
+ testBundlesAreLoadedFor("org.jboss.tools.portlet.feature");
+ }
+}
Property changes on: trunk/portlet/tests/org.jboss.tools.portlet.core.test/src/org/jboss/tools/portlet/core/test/PortletPluginsLoadTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
14 years, 5 months
JBoss Tools SVN: r18361 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core: jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-10-29 18:34:21 -0400 (Thu, 29 Oct 2009)
New Revision: 18361
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DeployableLaunchConfiguration.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
JBIDE-5123 - deprecated the 'stripped' launch configuration which did nothing; removed it from plugin.xml
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DeployableLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DeployableLaunchConfiguration.java 2009-10-29 22:32:01 UTC (rev 18360)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/DeployableLaunchConfiguration.java 2009-10-29 22:34:21 UTC (rev 18361)
@@ -19,6 +19,9 @@
import org.eclipse.wst.server.core.ServerUtil;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
+/**
+ * @deprecated
+ */
public class DeployableLaunchConfiguration implements
ILaunchConfigurationDelegate {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-10-29 22:32:01 UTC (rev 18360)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-10-29 22:34:21 UTC (rev 18361)
@@ -436,14 +436,6 @@
sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
sourcePathComputerId="org.eclipse.jst.server.tomcat.core.sourcePathComputer"/>
<launchConfigurationType
- delegate="org.jboss.ide.eclipse.as.core.server.internal.launch.DeployableLaunchConfiguration"
- id="org.jboss.ide.eclipse.as.core.server.stripped.launchConfiguration"
- modes="run,debug"
- name="Stripped Server Launch Configuration"
- public="false"
- sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
- sourcePathComputerId="org.eclipse.jst.server.tomcat.core.sourcePathComputer"/>
- <launchConfigurationType
delegate="org.jboss.ide.eclipse.as.core.server.internal.launch.TwiddleLaunchConfiguration"
id="org.jboss.ide.eclipse.as.core.server.twiddleConfiguration"
modes="run"
14 years, 5 months