JBoss Tools SVN: r9115 - trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-07-10 09:27:38 -0400 (Thu, 10 Jul 2008)
New Revision: 9115
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/ViewIDDirectEditPolicy.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2309
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-07-10 12:52:26 UTC (rev 9114)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2008-07-10 13:27:38 UTC (rev 9115)
@@ -296,20 +296,10 @@
super.deactivate();
}
- private static PagesElement toDelete = null;
-
- public static void deleteChild(PagesElement element){
- toDelete = element;
- }
-
/**
* @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
*/
public void notifyChanged(Notification notification) {
- if(toDelete != null){
- toDelete.setParent(null);
- toDelete = null;
- }
refresh();
refreshVisuals();
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDDirectEditPolicy.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDDirectEditPolicy.java 2008-07-10 12:52:26 UTC (rev 9114)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDDirectEditPolicy.java 2008-07-10 13:27:38 UTC (rev 9115)
@@ -69,8 +69,6 @@
props.setProperty("mouse.y", ""+node.getLocation().y);
XModelObject object = (XModelObject)node.getPagesModel().getData();
- PagesDiagramEditPart.deleteChild(node);
-
if(node instanceof Page)
AddPageOnDiagramHandler.createPage(object, value, props);
else if(node instanceof PageException)
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java 2008-07-10 12:52:26 UTC (rev 9114)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java 2008-07-10 13:27:38 UTC (rev 9115)
@@ -10,10 +10,6 @@
******************************************************************************/
package org.jboss.tools.seam.ui.pages.editor.edit;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.gef.EditPartViewer;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.editparts.ZoomListener;
import org.eclipse.gef.editparts.ZoomManager;
@@ -23,18 +19,15 @@
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IActionBars;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.internal.Workbench;
-import org.eclipse.ui.internal.WorkbenchWindow;
import org.eclipse.ui.part.CellEditorActionHandler;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement;
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.PageFigure;
@@ -46,7 +39,6 @@
private IAction copy, cut, paste, undo, redo, find, selectAll, delete;
private double cachedZoom = -1.0;
private Font scaledFont;
- private EditPartViewer viewer = null;
private ZoomListener zoomListener = new ZoomListener() {
public void zoomChanged(double newZoom) {
updateScaledFont(newZoom);
@@ -61,7 +53,7 @@
* @see org.eclipse.gef.tools.DirectEditManager#bringDown()
*/
protected void bringDown() {
- ZoomManager zoomMgr = (ZoomManager) viewer
+ ZoomManager zoomMgr = (ZoomManager) getEditPart().getViewer()
.getProperty(ZoomManager.class.toString());
if (zoomMgr != null)
zoomMgr.removeZoomListener(zoomListener);
@@ -79,46 +71,13 @@
super.bringDown();
// dispose any scaled fonts that might have been created
disposeScaledFont();
+
+ PagesElement element = ((PagesEditPart)getEditPart()).getElementModel();
+ element.setParent(null);
}
protected CellEditor createCellEditorOn(Composite composite) {
- return new TextCellEditor(composite, SWT.SINGLE | SWT.WRAP);// {
-// protected void setErrorMessage(String message) {
-// super.setErrorMessage(message);
-// ((WorkbenchWindow) Workbench.getInstance()
-// .getActiveWorkbenchWindow()).getStatusLineManager()
-// .setErrorMessage(message);
-// }
-//
-// protected void editOccured(ModifyEvent e) {
-// String value = text.getText();
-// if (value == null) {
-// value = "";//$NON-NLS-1$
-// }
-// Object typedValue = value;
-// boolean oldValidState = isValueValid();
-// boolean newValidState = isCorrect(typedValue);
-// if (typedValue == null && newValidState) {
-// Assert
-// .isTrue(false,
-// "Validator isn't limiting the cell editor's type range");//$NON-NLS-1$
-// }
-// if (!newValidState) {
-// // try to insert the current value into the error message.
-// setErrorMessage(MessageFormat.format(getErrorMessage(),
-// new Object[] { value }));
-// } else {
-// setErrorMessage("");
-// }
-// valueChanged(oldValidState, newValidState);
-// }
-//
-// protected Control createControl(Composite parent) {
-// Control control = super.createControl(parent);
-// setErrorMessage("");
-// return control;
-// }
-// };
+ return new TextCellEditor(composite, SWT.SINGLE | SWT.WRAP);
}
private void disposeScaledFont() {
@@ -130,7 +89,6 @@
protected void initCellEditor() {
// update text
- viewer = getEditPart().getViewer();
NodeFigure stickyNote = (NodeFigure) getEditPart().getFigure();
if(stickyNote instanceof PageFigure)
getCellEditor().setValue(((PageFigure)stickyNote).page.getName());
15 years, 10 months
JBoss Tools SVN: r9114 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor: edit and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2008-07-10 08:52:26 -0400 (Thu, 10 Jul 2008)
New Revision: 9114
Added:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDDirectEditPolicy.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditorLocator.java
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddPageOnDiagramHandler.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java
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/figures/ExceptionFigure.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2309
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-07-09 19:47:26 UTC (rev 9113)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddExceptionOnDiagramHandler.java 2008-07-10 12:52:26 UTC (rev 9114)
@@ -1,8 +1,8 @@
package org.jboss.tools.seam.ui.pages.editor.commands;
import java.util.Properties;
-import java.util.Random;
+import org.eclipse.draw2d.geometry.Point;
import org.jboss.tools.common.meta.XChild;
import org.jboss.tools.common.meta.XModelEntity;
import org.jboss.tools.common.meta.action.impl.AbstractHandler;
@@ -12,6 +12,8 @@
import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
import org.jboss.tools.seam.pages.xml.model.handlers.AddExceptionHandler;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PagesFactoryImpl;
import org.jboss.tools.seam.ui.pages.editor.edit.PagesDiagramEditPart;
public class AddExceptionOnDiagramHandler extends AbstractHandler {
@@ -27,12 +29,11 @@
PagesDiagramEditPart part = (PagesDiagramEditPart)p.get("diagramEditPart");
int x = Integer.parseInt(p.getProperty("mouse.x"));
int y = Integer.parseInt(p.getProperty("mouse.y"));
- System.out.println("x=" + x + " y=" + y + " part=" + part);
- String className = "/test" + (new Random()).nextInt(10000);
- AddExceptionOnDiagramHandler.createException(object, className, p);
-
-// XActionInvoker.invoke("CreateActions.AddExceptionWizard", object, p);
+ PageException newException = PagesFactoryImpl.eINSTANCE.createPgException();
+ newException.setName("");
+ newException.setLocation(new Point(x,y));
+ part.getPagesModel().getChildren().add(newException);
}
/**
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddPageOnDiagramHandler.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddPageOnDiagramHandler.java 2008-07-09 19:47:26 UTC (rev 9113)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/commands/AddPageOnDiagramHandler.java 2008-07-10 12:52:26 UTC (rev 9114)
@@ -1,8 +1,8 @@
package org.jboss.tools.seam.ui.pages.editor.commands;
import java.util.Properties;
-import java.util.Random;
+import org.eclipse.draw2d.geometry.Point;
import org.jboss.tools.common.meta.action.impl.AbstractHandler;
import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
@@ -11,6 +11,8 @@
import org.jboss.tools.seam.pages.xml.model.handlers.AddExceptionHandler;
import org.jboss.tools.seam.pages.xml.model.handlers.AddViewSupport;
import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesDiagramHelper;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.impl.PagesFactoryImpl;
import org.jboss.tools.seam.ui.pages.editor.edit.PagesDiagramEditPart;
public class AddPageOnDiagramHandler extends AbstractHandler {
@@ -26,13 +28,11 @@
PagesDiagramEditPart part = (PagesDiagramEditPart)p.get("diagramEditPart");
int x = Integer.parseInt(p.getProperty("mouse.x"));
int y = Integer.parseInt(p.getProperty("mouse.y"));
- System.out.println("x=" + x + " y=" + y + " part=" + part);
-//
- String viewId = "/test" + (new Random()).nextInt(10000);
- AddPageOnDiagramHandler.createPage(object, viewId, p);
-
-// XActionInvoker.invoke("CreateActions.AddPageWizard", object, p);
+ Page newPage = PagesFactoryImpl.eINSTANCE.createPage();
+ newPage.setName("");
+ newPage.setLocation(new Point(x,y));
+ part.getPagesModel().getChildren().add(newPage);
}
/**
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java 2008-07-09 19:47:26 UTC (rev 9113)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ExceptionEditPart.java 2008-07-10 12:52:26 UTC (rev 9114)
@@ -29,6 +29,7 @@
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
+import org.eclipse.gef.requests.DirectEditRequest;
import org.eclipse.gef.requests.DropRequest;
import org.eclipse.swt.accessibility.AccessibleControlEvent;
import org.eclipse.swt.accessibility.AccessibleEvent;
@@ -113,15 +114,20 @@
protected List getModelSourceConnections() {
return getExceptionModel().getOutputLinks();
}
+
+ public void performRequest(Request req) {
+ if (req.getType() == GraphicalPartFactory.REQ_INIT_EDIT) {
+ new ViewIDEditManager(this, new ViewIDEditorLocator(
+ (ExceptionFigure) getFigure())).show();
+ }
+ }
protected void createEditPolicies() {
super.createEditPolicies();
installEditPolicy(EditPolicy.NODE_ROLE, null);
installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, null);
- //installEditPolicy(EditPolicy.COMPONENT_ROLE, new PageEditPolicy());
- //installEditPolicy(EditPolicy.LAYOUT_ROLE, new JSFFlowEditPolicy());
- //installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE,
- // new PageEditPolicy());
+ installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,
+ new ViewIDDirectEditPolicy());
}
/**
@@ -162,7 +168,10 @@
protected void refreshVisuals() {
Point loc = getExceptionModel().getLocation();
String text = getExceptionReadOnlyLabel();
- int width = getIconWidth()+FigureUtilities.getTextExtents(text, NodeFigure.nodeLabelFont).width;
+ int width = getIconWidth()+FigureUtilities.getTextExtents(text, NodeFigure.nodeLabelFont).width;
+
+ if(width < getMinimumWidth()) width = getMinimumWidth();
+
size = new Dimension(width, getVisualHeight());
adjustForGrid(loc);
@@ -171,8 +180,10 @@
((GraphicalEditPart) getParent()).setLayoutConstraint(this,
getFigure(), r);
}
-
+ private int getMinimumWidth() {
+ return 130;
+ }
private int getVisualHeight() {
return 21;
@@ -231,6 +242,11 @@
return;
((Notifier) getModel()).eAdapters().add(this);
super.activate();
+ if("".equals(getExceptionModel().getName())){
+ DirectEditRequest req = new DirectEditRequest();
+ req.setType(GraphicalPartFactory.REQ_INIT_EDIT);
+ performRequest(req);
+ }
}
public void deactivate(){
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java 2008-07-09 19:47:26 UTC (rev 9113)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/GraphicalPartFactory.java 2008-07-10 12:52:26 UTC (rev 9114)
@@ -20,6 +20,7 @@
public class GraphicalPartFactory implements EditPartFactory {
+ public static final String REQ_INIT_EDIT = "init edit"; //$NON-NLS-1$
public EditPart createEditPart(EditPart context, Object model) {
EditPart child = null;
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-07-09 19:47:26 UTC (rev 9113)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PageEditPart.java 2008-07-10 12:52:26 UTC (rev 9114)
@@ -30,6 +30,7 @@
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
import org.eclipse.gef.RequestConstants;
+import org.eclipse.gef.requests.DirectEditRequest;
import org.eclipse.gef.requests.DropRequest;
import org.eclipse.gef.requests.SelectionRequest;
import org.eclipse.swt.accessibility.AccessibleControlEvent;
@@ -134,6 +135,9 @@
SeamUiPagesPlugin.log(e);
}
}
+ }else if (req.getType() == GraphicalPartFactory.REQ_INIT_EDIT) {
+ new ViewIDEditManager(this, new ViewIDEditorLocator(
+ (PageFigure) getFigure())).show();
}
}
@@ -143,6 +147,8 @@
installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, null);
installEditPolicy(EditPolicy.CONNECTION_ENDPOINTS_ROLE,
new PageEditPolicy());
+ installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE,
+ new ViewIDDirectEditPolicy());
}
/**
@@ -182,6 +188,8 @@
int width = getIconWidth()+FigureUtilities.getTextExtents(getPageModel().getName(), NodeFigure.nodeLabelFont).width;
+ if(width < getMinimumWidth()) width = getMinimumWidth();
+
size = new Dimension(width, height);
adjustForGrid(loc);
@@ -198,8 +206,11 @@
private int getIconWidth() {
return 30;
}
+
+ private int getMinimumWidth() {
+ return 130;
+ }
-
public ConnectionAnchor getTargetConnectionAnchor(
ConnectionEditPart connEditPart) {
ConnectionAnchor anc = getNodeFigure().getConnectionAnchor("1_IN");
@@ -239,6 +250,11 @@
return;
((Notifier) getModel()).eAdapters().add(this);
super.activate();
+ if("".equals(getPageModel().getName())){
+ DirectEditRequest req = new DirectEditRequest();
+ req.setType(GraphicalPartFactory.REQ_INIT_EDIT);
+ performRequest(req);
+ }
}
public void deactivate() {
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-07-09 19:47:26 UTC (rev 9113)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/PagesDiagramEditPart.java 2008-07-10 12:52:26 UTC (rev 9114)
@@ -38,6 +38,7 @@
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.PagesElement;
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;
@@ -295,10 +296,20 @@
super.deactivate();
}
+ private static PagesElement toDelete = null;
+
+ public static void deleteChild(PagesElement element){
+ toDelete = element;
+ }
+
/**
* @see org.eclipse.emf.common.notify.Adapter#notifyChanged(org.eclipse.emf.common.notify.Notification)
*/
public void notifyChanged(Notification notification) {
+ if(toDelete != null){
+ toDelete.setParent(null);
+ toDelete = null;
+ }
refresh();
refreshVisuals();
}
Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDDirectEditPolicy.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDDirectEditPolicy.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDDirectEditPolicy.java 2008-07-10 12:52:26 UTC (rev 9114)
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * 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.edit;
+
+import java.util.Properties;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.editpolicies.DirectEditPolicy;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.jboss.tools.common.model.XModelObject;
+import org.jboss.tools.seam.ui.pages.editor.commands.AddExceptionOnDiagramHandler;
+import org.jboss.tools.seam.ui.pages.editor.commands.AddPageOnDiagramHandler;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.Page;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PageException;
+import org.jboss.tools.seam.ui.pages.editor.ecore.pages.PagesElement;
+
+public class ViewIDDirectEditPolicy extends DirectEditPolicy {
+
+ /**
+ * @see DirectEditPolicy#getDirectEditCommand(DirectEditRequest)
+ */
+ protected Command getDirectEditCommand(DirectEditRequest edit) {
+ String labelText = (String) edit.getCellEditor().getValue();
+ PagesEditPart node = (PagesEditPart) getHost();
+ PagesElement element = node.getElementModel();
+ if (element != null) {
+ return new FlowNameCommand(element, labelText);
+ }
+ return null;
+ }
+
+ /**
+ * @see DirectEditPolicy#showCurrentEditValue(DirectEditRequest)
+ */
+ protected void showCurrentEditValue(DirectEditRequest request) {
+ }
+
+ public class FlowNameCommand extends Command {
+
+ PagesElement node;
+ String value;
+
+ public FlowNameCommand(PagesElement node, String value) {
+ this.node = node;
+ this.value = value;
+ }
+
+ public boolean canExecute() {
+ if (value == null)
+ return false;
+ return true;
+ }
+
+ public boolean canUndo() {
+ return false;
+ }
+
+ public void execute() {
+ Properties props = new Properties();
+ props.setProperty("mouse.x", ""+node.getLocation().x);
+ props.setProperty("mouse.y", ""+node.getLocation().y);
+ XModelObject object = (XModelObject)node.getPagesModel().getData();
+
+ PagesDiagramEditPart.deleteChild(node);
+
+ if(node instanceof Page)
+ AddPageOnDiagramHandler.createPage(object, value, props);
+ else if(node instanceof PageException)
+ AddExceptionOnDiagramHandler.createException(object, value, props);
+ }
+ }
+
+}
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDDirectEditPolicy.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java 2008-07-10 12:52:26 UTC (rev 9114)
@@ -0,0 +1,207 @@
+/*******************************************************************************
+ * 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.edit;
+
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.Assert;
+import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.editparts.ZoomListener;
+import org.eclipse.gef.editparts.ZoomManager;
+import org.eclipse.gef.tools.CellEditorLocator;
+import org.eclipse.gef.tools.DirectEditManager;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.TextCellEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.graphics.Font;
+import org.eclipse.swt.graphics.FontData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IActionBars;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.actions.ActionFactory;
+import org.eclipse.ui.internal.Workbench;
+import org.eclipse.ui.internal.WorkbenchWindow;
+import org.eclipse.ui.part.CellEditorActionHandler;
+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.PageFigure;
+
+public class ViewIDEditManager extends DirectEditManager {
+
+ private IActionBars actionBars;
+ private CellEditorActionHandler actionHandler;
+ private IAction copy, cut, paste, undo, redo, find, selectAll, delete;
+ private double cachedZoom = -1.0;
+ private Font scaledFont;
+ private EditPartViewer viewer = null;
+ private ZoomListener zoomListener = new ZoomListener() {
+ public void zoomChanged(double newZoom) {
+ updateScaledFont(newZoom);
+ }
+ };
+
+ public ViewIDEditManager(GraphicalEditPart source, CellEditorLocator locator) {
+ super(source, null, locator);
+ }
+
+ /**
+ * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
+ */
+ protected void bringDown() {
+ ZoomManager zoomMgr = (ZoomManager) viewer
+ .getProperty(ZoomManager.class.toString());
+ if (zoomMgr != null)
+ zoomMgr.removeZoomListener(zoomListener);
+
+ if (actionHandler != null) {
+ actionHandler.dispose();
+ actionHandler = null;
+ }
+ if (actionBars != null) {
+ restoreSavedActions(actionBars);
+ actionBars.updateActionBars();
+ actionBars = null;
+ }
+
+ super.bringDown();
+ // dispose any scaled fonts that might have been created
+ disposeScaledFont();
+ }
+
+ protected CellEditor createCellEditorOn(Composite composite) {
+ return new TextCellEditor(composite, SWT.SINGLE | SWT.WRAP);// {
+// protected void setErrorMessage(String message) {
+// super.setErrorMessage(message);
+// ((WorkbenchWindow) Workbench.getInstance()
+// .getActiveWorkbenchWindow()).getStatusLineManager()
+// .setErrorMessage(message);
+// }
+//
+// protected void editOccured(ModifyEvent e) {
+// String value = text.getText();
+// if (value == null) {
+// value = "";//$NON-NLS-1$
+// }
+// Object typedValue = value;
+// boolean oldValidState = isValueValid();
+// boolean newValidState = isCorrect(typedValue);
+// if (typedValue == null && newValidState) {
+// Assert
+// .isTrue(false,
+// "Validator isn't limiting the cell editor's type range");//$NON-NLS-1$
+// }
+// if (!newValidState) {
+// // try to insert the current value into the error message.
+// setErrorMessage(MessageFormat.format(getErrorMessage(),
+// new Object[] { value }));
+// } else {
+// setErrorMessage("");
+// }
+// valueChanged(oldValidState, newValidState);
+// }
+//
+// protected Control createControl(Composite parent) {
+// Control control = super.createControl(parent);
+// setErrorMessage("");
+// return control;
+// }
+// };
+ }
+
+ private void disposeScaledFont() {
+ if (scaledFont != null) {
+ scaledFont.dispose();
+ scaledFont = null;
+ }
+ }
+
+ protected void initCellEditor() {
+ // update text
+ viewer = getEditPart().getViewer();
+ NodeFigure stickyNote = (NodeFigure) getEditPart().getFigure();
+ if(stickyNote instanceof PageFigure)
+ getCellEditor().setValue(((PageFigure)stickyNote).page.getName());
+ else if(stickyNote instanceof ExceptionFigure)
+ getCellEditor().setValue(((ExceptionFigure)stickyNote).exc.getName());
+
+ // update font
+ ZoomManager zoomMgr = (ZoomManager) getEditPart().getViewer()
+ .getProperty(ZoomManager.class.toString());
+ if (zoomMgr != null) {
+ // this will force the font to be set
+ cachedZoom = -1.0;
+ updateScaledFont(zoomMgr.getZoom());
+ zoomMgr.addZoomListener(zoomListener);
+ } else
+ getCellEditor().getControl().setFont(stickyNote.getFont());
+
+ // Hook the cell editor's copy/paste actions to the actionBars so that
+ // they can
+ // be invoked via keyboard shortcuts.
+ actionBars = PlatformUI.getWorkbench().getActiveWorkbenchWindow()
+ .getActivePage().getActiveEditor().getEditorSite()
+ .getActionBars();
+ saveCurrentActions(actionBars);
+ actionHandler = new CellEditorActionHandler(actionBars);
+ actionHandler.addCellEditor(getCellEditor());
+ actionBars.updateActionBars();
+ // getCellEditor().setValidator(NameValidator.instance);
+ }
+
+ private void restoreSavedActions(IActionBars actionBars) {
+ actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copy);
+ actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(), paste);
+ actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), delete);
+ actionBars.setGlobalActionHandler(ActionFactory.SELECT_ALL.getId(),
+ selectAll);
+ actionBars.setGlobalActionHandler(ActionFactory.CUT.getId(), cut);
+ actionBars.setGlobalActionHandler(ActionFactory.FIND.getId(), find);
+ actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(), undo);
+ actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(), redo);
+ }
+
+ private void saveCurrentActions(IActionBars actionBars) {
+ copy = actionBars.getGlobalActionHandler(ActionFactory.COPY.getId());
+ paste = actionBars.getGlobalActionHandler(ActionFactory.PASTE.getId());
+ delete = actionBars
+ .getGlobalActionHandler(ActionFactory.DELETE.getId());
+ selectAll = actionBars.getGlobalActionHandler(ActionFactory.SELECT_ALL
+ .getId());
+ cut = actionBars.getGlobalActionHandler(ActionFactory.CUT.getId());
+ find = actionBars.getGlobalActionHandler(ActionFactory.FIND.getId());
+ undo = actionBars.getGlobalActionHandler(ActionFactory.UNDO.getId());
+ redo = actionBars.getGlobalActionHandler(ActionFactory.REDO.getId());
+ }
+
+ private void updateScaledFont(double zoom) {
+ if (cachedZoom == zoom)
+ return;
+
+ Text text = (Text) getCellEditor().getControl();
+ Font font = getEditPart().getFigure().getFont();
+
+ disposeScaledFont();
+ cachedZoom = zoom;
+ if (zoom == 1.0)
+ text.setFont(font);
+ else {
+ FontData fd = font.getFontData()[0];
+ fd.setHeight((int) (fd.getHeight() * zoom));
+ text.setFont(scaledFont = new Font(null, fd));
+ }
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditManager.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditorLocator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditorLocator.java (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditorLocator.java 2008-07-10 12:52:26 UTC (rev 9114)
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * 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.edit;
+
+import org.eclipse.swt.widgets.Text;
+
+import org.eclipse.jface.viewers.CellEditor;
+
+import org.eclipse.draw2d.geometry.Rectangle;
+
+import org.eclipse.gef.tools.CellEditorLocator;
+import org.jboss.tools.seam.ui.pages.editor.figures.NodeFigure;
+import org.jboss.tools.seam.ui.pages.editor.figures.PageFigure;
+
+final public class ViewIDEditorLocator implements CellEditorLocator {
+
+ private NodeFigure nodeFigure;
+
+ public ViewIDEditorLocator(NodeFigure nodeFigure) {
+ setFigure(nodeFigure);
+ }
+
+ public void relocate(CellEditor celleditor) {
+ Text text = (Text) celleditor.getControl();
+ Rectangle rect = nodeFigure.getClientArea();
+ nodeFigure.translateToAbsolute(rect);
+ org.eclipse.swt.graphics.Rectangle trim = text.computeTrim(0, 0, 0, 0);
+ rect.translate(trim.x, trim.y);
+ rect.width += trim.width;
+ rect.height = 14;
+ text.setBounds(rect.x+25, rect.y+2, rect.width-27, rect.height);
+ }
+
+ /**
+ * Returns the node figure.
+ */
+ protected NodeFigure getFigure() {
+ return nodeFigure;
+ }
+
+ /**
+ * Sets the node figure.
+ *
+ */
+ protected void setFigure(NodeFigure nodeFigure) {
+ this.nodeFigure = nodeFigure;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/edit/ViewIDEditorLocator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java 2008-07-09 19:47:26 UTC (rev 9113)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/ExceptionFigure.java 2008-07-10 12:52:26 UTC (rev 9114)
@@ -52,7 +52,7 @@
public ExceptionFigure(PageException group) {
this.exc = group;
- if (group != null) {
+ if (group != null && group.getData() != null) {
setIcon(group.getImage());
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-07-09 19:47:26 UTC (rev 9113)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/figures/PageFigure.java 2008-07-10 12:52:26 UTC (rev 9114)
@@ -59,7 +59,7 @@
public PageFigure(Page group) {
this.page = group;
- if (group != null) {
+ if (group != null && group.getData() != null) {
setIcon(group.getImage());
initConnectionAnchors(group.getOutputLinks().size());
}
15 years, 10 months
JBoss Tools SVN: r9113 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-07-09 15:47:26 -0400 (Wed, 09 Jul 2008)
New Revision: 9113
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java
Log:
JBIDE-2434
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java 2008-07-09 18:59:48 UTC (rev 9112)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE2434Test.java 2008-07-09 19:47:26 UTC (rev 9113)
@@ -11,6 +11,11 @@
package org.jboss.tools.jsf.vpe.jsf.test.jbide;
import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.editor.VpeEditorPart;
import org.jboss.tools.vpe.ui.test.TestUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
@@ -25,11 +30,48 @@
public JBIDE2434Test(String name) {
super(name);
}
-
+ /**
+ * tests open and close editor in page
+ * @throws Throwable
+ */
public void testOpenAndCloPageWithCycleFacelets() throws Throwable {
performTestForVpeComponent((IFile) TestUtil.getComponentPath("JBIDE/2434/FaceletForm.xhtml",IMPORT_PROJECT_NAME)); //$NON-NLS-1$
}
-
-
-
+ /**
+ * Tests visual refresh method
+ * @throws Throwable
+ */
+ public void testVisualRefreshAndSwitchToPreview() throws Throwable {
+ // wait
+ TestUtil.waitForJobs();
+ // set exception
+ setException(null);
+ // Tests CA
+ // get test page path
+ IFile file = (IFile) TestUtil.getComponentPath("JBIDE/2434/FaceletBlank.xhtml", //$NON-NLS-1$
+ IMPORT_PROJECT_NAME);
+ assertNotNull("Could not open specified file " + "JBIDE/2434/FaceletBlank.xhtml", file); //$NON-NLS-1$ //$NON-NLS-2$
+
+ IEditorInput input = new FileEditorInput(file);
+
+ assertNotNull("Editor input is null", input); //$NON-NLS-1$
+
+ // open and get editor
+ JSPMultiPageEditor part = openEditor(input);
+
+ VpeController controller = getVpeController(part);
+ controller.visualRefresh();
+ TestUtil.waitForJobs();
+ part.getVisualEditor().setVisualMode(0);
+ part.getVisualEditor().setVisualMode(1);
+ part.getVisualEditor().setVisualMode(2);
+ ((VpeEditorPart)part.getVisualEditor()).createPreviewBrowser();
+ part.getVisualEditor().setVisualMode(3);
+
+ TestUtil.waitForJobs();
+ if(getException()!=null) {
+ throw getException();
+ }
+ }
+
}
15 years, 10 months
JBoss Tools SVN: r9112 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-07-09 14:59:48 -0400 (Wed, 09 Jul 2008)
New Revision: 9112
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java
Log:
JBIDE-2434
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java 2008-07-09 18:36:25 UTC (rev 9111)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java 2008-07-09 18:59:48 UTC (rev 9112)
@@ -24,6 +24,7 @@
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocumentType;
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
+import org.jboss.tools.vpe.VpePlugin;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -50,8 +51,9 @@
* @param editorInput
* @return
*/
- static public String getDoctype(IEditorInput editorInput) {
+ public static String getDoctype(IEditorInput editorInput) {
+ try{
// if opened file is located in eclipse workspace
if (editorInput instanceof IFileEditorInput) {
IFile f = ((IFileEditorInput) editorInput).getFile();
@@ -64,7 +66,12 @@
return null;
return getDoctype(path.toFile());
}
- return null;
+ }catch(StackOverflowError stackOverflowError) {
+ //Fix For JBIDE-2434
+ VpePlugin.getPluginLog().logInfo(stackOverflowError.toString());
+ return ""; //$NON-NLS-1$
+ }
+ return null;
}
@@ -74,7 +81,7 @@
* @param file
* @return
*/
- static public String getDoctype(IFile file) {
+ private static String getDoctype(IFile file) {
String docTypeValue = null;
15 years, 10 months
JBoss Tools SVN: r9111 - in trunk/seam: tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-07-09 14:36:25 -0400 (Wed, 09 Jul 2008)
New Revision: 9111
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-2489 Fixed for seam-gen 2.0.1 and higher
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java 2008-07-09 17:31:16 UTC (rev 9110)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java 2008-07-09 18:36:25 UTC (rev 9111)
@@ -67,9 +67,13 @@
static {
// initialize war files mapping
+
+ // seam-gen uses @interfaceName@ as class name since 2.0.1
+ // but seam-gen 2.0.0 uses @beanName@ (it's a bug of 2.0.0)
+ // So we expect seam-gen 2.0.1 or higher here.
ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ConversationJavaBean.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_BEAN_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ "${" + IParameter.SEAM_PROJECT_SRC_ACTION + "}/${" + ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_PATH + "}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
FileMapping.TYPE.WAR,
false));
ACTION_MAPPING.add(new FileMapping(
@@ -77,6 +81,7 @@
"${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" + IParameter.SEAM_PAGE_NAME +"}.xhtml", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
FileMapping.TYPE.WAR,
false));
+
// initialize ear files mapping
ACTION_MAPPING.add(new FileMapping(
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME + "}/seam-gen/src/ConversationBean.java", //$NON-NLS-1$ //$NON-NLS-2$
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java 2008-07-09 17:31:16 UTC (rev 9110)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20WARNewOperationTest.java 2008-07-09 18:36:25 UTC (rev 9111)
@@ -12,35 +12,39 @@
import java.io.File;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.wst.common.project.facet.core.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamProjectsSet;
import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager;
import org.jboss.tools.seam.core.project.facet.SeamVersion;
+import org.jboss.tools.seam.ui.wizard.IParameter;
public class Seam20WARNewOperationTest extends Seam12WARNewOperationTest {
-
+
private IProjectFacet seam2Facet;
private IProjectFacetVersion seam2FacetVersion;
public Seam20WARNewOperationTest(String name) {
super(name);
- // TODO Auto-generated constructor stub
}
@Override
protected void setUp() throws Exception {
assertSeamHomeAvailable();
-
+
seam2Facet = ProjectFacetsManager.getProjectFacet("jst.seam");
seam2FacetVersion = seam2Facet.getVersion("2.0");
-
-
+
File folder = getSeamHomeFolder();
-
+
SeamRuntimeManager.getInstance().addRuntime(SEAM_2_0_0, folder.getAbsolutePath(), SeamVersion.SEAM_2_0, true);
SeamRuntimeManager.getInstance().findRuntimeByName(SEAM_2_0_0);
-
+
super.setUp();
}
@@ -48,12 +52,12 @@
void setUpSeamProjects() {
setUpSeamProject(warProject);
}
-
+
@Override
protected String getSeamRTName() {
return AbstractSeamNewOperationTest.SEAM_2_0_0;
}
-
+
@Override
protected File getSeamHomeFolder() {
return new File(System.getProperty(SEAM_2_0_HOME));
@@ -64,4 +68,32 @@
return seam2FacetVersion;
}
-}
+ @Override
+ void assertNewConversationFilesAreCreatedSuccessfully(AdaptableRegistry data) {
+ IEclipsePreferences seamFacetPrefs = SeamCorePlugin.getSeamPreferences(warProject);
+ SeamProjectsSet seamPrjSet = new SeamProjectsSet(warProject);
+
+ String sessionBeanPackagePath = getPackagePath(getSessionBeanPackageName(seamFacetPrefs));
+
+ IContainer seamProjectSrcActionFolder = seamPrjSet.getActionFolder();
+ IContainer seamProjectWebContentFolder = seamPrjSet.getViewsFolder();
+
+ String seamPageName = data.getValue(IParameter.SEAM_PAGE_NAME);
+ // seam-gen uses @interfaceName@ as class name since 2.0.1
+ // but seam-gen 2.0.0 uses @beanName@ (it's a bug of 2.0.0)
+ // So we expect seam-gen 2.0.1 or higher here.
+ String interfaceName = data.getValue(IParameter.SEAM_LOCAL_INTERFACE_NAME);
+
+ IResource seamBeanJava = seamProjectSrcActionFolder.findMember(
+ sessionBeanPackagePath + "/" + interfaceName + ".java");
+ assertResourceIsCreatedAndHasNoProblems(seamBeanJava,
+ seamProjectSrcActionFolder.toString() + "/" +
+ sessionBeanPackagePath + "/" + interfaceName + ".java");
+
+ IResource seamPageNameXhtml = seamProjectWebContentFolder.findMember(
+ seamPageName + ".xhtml");
+ assertResourceIsCreatedAndHasNoProblems(seamPageNameXhtml,
+ seamProjectWebContentFolder.toString() + "/" +
+ seamPageName + ".xhtml");
+ }
+}
\ No newline at end of file
15 years, 10 months
JBoss Tools SVN: r9110 - 08.07.2008 and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: aklimkovich
Date: 2008-07-09 13:31:16 -0400 (Wed, 09 Jul 2008)
New Revision: 9110
Added:
trunk/documentation/qa/reports/Tests 08.07.2008/Create_and_run_dif_types_of_projects_09.07.2008.htm
Log:
Added a file remotely
Added: trunk/documentation/qa/reports/Tests 08.07.2008/Create_and_run_dif_types_of_projects_09.07.2008.htm
===================================================================
--- trunk/documentation/qa/reports/Tests 08.07.2008/Create_and_run_dif_types_of_projects_09.07.2008.htm (rev 0)
+++ trunk/documentation/qa/reports/Tests 08.07.2008/Create_and_run_dif_types_of_projects_09.07.2008.htm 2008-07-09 17:31:16 UTC (rev 9110)
@@ -0,0 +1,152 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD><TITLE>Execution Report</TITLE>
+<STYLE>H1 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+H2 {
+ COLOR: #4a5d75; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+TR {
+ BACKGROUND-COLOR: #f5f5f5
+}
+TD {
+ BORDER-RIGHT: dimgray 1px solid; PADDING-RIGHT: 0.5em; BORDER-TOP: dimgray 1px solid; PADDING-LEFT: 0.5em; PADDING-BOTTOM: 0.15em; BORDER-LEFT: dimgray 1px solid; PADDING-TOP: 0.15em; BORDER-BOTTOM: dimgray 1px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; BACKGROUND-COLOR: transparent
+}
+HR {
+ COLOR: #999; BORDER-COLLAPSE: collapse
+}
+BODY {
+ PADDING-RIGHT: 2em; PADDING-LEFT: 2em; FONT-SIZE: 12px; PADDING-BOTTOM: 0em; COLOR: #333; LINE-HEIGHT: 100%; PADDING-TOP: 0em; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; max-width: 55em
+}
+TABLE {
+ BORDER-RIGHT: dimgray 0px solid; BORDER-TOP: dimgray 0px solid; BORDER-LEFT: dimgray 0px solid; COLOR: #4a5d75; BORDER-BOTTOM: dimgray 0px solid; FONT-FAMILY: 'Lucida Grande', Geneva, Verdana, Arial, sans-serif
+}
+</STYLE>
+
+<META http-equiv=Content-Type content="text/html; charset=ISO-8859-5">
+<META content="MSHTML 6.00.2900.2180" name=GENERATOR></HEAD>
+<BODY bgColor=#f5f5f5>
+<CENTER>
+<H1>Create and run different types of projects</H1>
+<TABLE
+style="BORDER-TOP-WIDTH: 1pt; BORDER-LEFT-WIDTH: 1pt; BORDER-BOTTOM-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"
+cellSpacing=0 cellPadding=4 width="100%" align=center>
+ <TBODY>
+ <TR bgColor=gray>
+ <TD><B>Exec Date</B></TD>
+ <TD><B>sTest Name</B></TD>
+ <TD><B>Status</B></TD>
+ <TD><B>Bug Number</B></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">09.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating JSF
+ 1.1.02 project with servlet version 2.4.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">09.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating JSF
+ 1.1.02 project with servlet version 2.3.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">09.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating JSF
+ 1.2 - RI with Facelets project with servlet version 2.5.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">09.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating JSF
+ 1.2 project with servlet version 2.5.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">09.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Register
+ applications in the JBoss server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">09.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Running
+ created applications</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">09.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Unregister
+ applications from JBoss server</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">09.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ Struts 1.1 project with servlet version 2.3.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">09.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ Struts 1.1 project with servlet version 2.4.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">09.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ Struts 1.2 project with servlet version 2.3</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">09.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ Struts 1.2 project with servlet version 2.4</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">09.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ MyFaces 1.1.4 project (MyFacesKickStart).</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=papayawhip>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">09.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ Struts 1.1 project with servlet version 2.5.</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white size=1> </FONT></TD></TR>
+ <TR bgColor=seashell>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt">09.07.2008</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"> Creating
+ Struts 1.2 project with servlet version 2.5</TD>
+ <TD
+ style="BORDER-TOP-WIDTH: 1pt; COLOR: green; BORDER-RIGHT-WIDTH: 1pt">Passed</TD>
+ <TD style="BORDER-TOP-WIDTH: 1pt; BORDER-RIGHT-WIDTH: 1pt"><FONT
+ color=white
+size=1> </FONT></TD></TR></TBODY></TABLE></CENTER></BODY></HTML>
15 years, 10 months
JBoss Tools SVN: r9109 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-07-09 13:26:31 -0400 (Wed, 09 Jul 2008)
New Revision: 9109
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAMessageBundlesAndEL.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-2444, testcase for jsfc atributes was fixed
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAMessageBundlesAndEL.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAMessageBundlesAndEL.xhtml 2008-07-09 16:29:54 UTC (rev 9108)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/788/testCAMessageBundlesAndEL.xhtml 2008-07-09 17:26:31 UTC (rev 9109)
@@ -18,7 +18,7 @@
<form jsfc="h:form" id="helloForm">
${msg.prompt}
<input label="Name" jsfc="h:inputText" required="true" id="name" value="#{person.name}" />
- <input type="submit" jsfc="h:commandButton" id="submit"
+ <input type="submit" jsfc="h:command" id="submit"
action="greeting" value="Say Hello" />
</form>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-07-09 16:29:54 UTC (rev 9108)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-07-09 17:26:31 UTC (rev 9109)
@@ -78,27 +78,25 @@
ICompletionProposal[] results = checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml","",11,31,false); //$NON-NLS-1$ //$NON-NLS-2$
assertNotNull(results);
assertTrue("The lenft should be more than 0",results.length>0); //$NON-NLS-1$
- boolean isMatches=true;
for (ICompletionProposal completionProposal : results) {
String displayString = ((ICompletionProposal) completionProposal).getDisplayString();
- if(!displayString.startsWith("msg.")) { //$NON-NLS-1$
- isMatches=false;
+ if(!displayString.startsWith("${msg.")) { //$NON-NLS-1$
+ //TODO Max Areshkau Fix When JBIDE-2498 will be fixed
+ fail("String doesn't matches"); //$NON-NLS-1$
}
}
- assertTrue("String not matches", isMatches); //$NON-NLS-1$
- //TODO Max Areshkau This functionality doesn't works now,
+
results = checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAPathProposals.xhtml","",11,41,false); //$NON-NLS-1$//$NON-NLS-2$
assertNotNull(results);
- isMatches = false;
+
for(ICompletionProposal completionProposal : results) {
String displayString = ((ICompletionProposal) completionProposal).getDisplayString();
- if(displayString.contains("temp")) { //$NON-NLS-1$
- isMatches=true;
+ if(!displayString.contains("temp")) { //$NON-NLS-1$
+ fail("String doesn't matches"); //$NON-NLS-1$
}
}
- assertTrue("String not matches", isMatches); //$NON-NLS-1$
// check exception
if (getException() != null) {
@@ -117,10 +115,16 @@
// set exception
setException(null);
// Tests CA
-// checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml","p",1203); //$NON-NLS-1$//$NON-NLS-2$
-
- //TODO Max Areshkau Repair when this functionality will be workd
- fail("This functionality doesn't works now"); //$NON-NLS-1$
+ ICompletionProposal[] results =checkOfCAByStartString(CA_NAME, "JBIDE/788/testCAMessageBundlesAndEL.xhtml","",21,58); //$NON-NLS-1$//$NON-NLS-2$
+ assertNotNull(results);
+ assertTrue(results.length>2);
+ for(ICompletionProposal completionProposal : results) {
+ String displayString = ((ICompletionProposal) completionProposal).getDisplayString();
+ if(!displayString.startsWith("h:command") && !displayString.startsWith("#{")) { //$NON-NLS-1$ //$NON-NLS-2$
+ fail("String doesn't matches"); //$NON-NLS-1$
+ }
+ }
+
// check exception
if (getException() != null) {
15 years, 10 months
JBoss Tools SVN: r9108 - in trunk: jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-07-09 12:29:54 -0400 (Wed, 09 Jul 2008)
New Revision: 9108
Added:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/JSF.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1719
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java 2008-07-09 14:29:11 UTC (rev 9107)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfOptionSelectItemTemplate.java 2008-07-09 16:29:54 UTC (rev 9108)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.jsf.vpe.jsf.template;
+import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
import org.jboss.tools.jsf.vpe.jsf.template.util.ComponentUtil;
import org.jboss.tools.jsf.vpe.jsf.template.util.JSF;
import org.jboss.tools.jsf.vpe.jsf.template.util.NodeProxyUtil;
@@ -18,6 +19,7 @@
import org.jboss.tools.vpe.editor.mapping.AttributeData;
import org.jboss.tools.vpe.editor.template.VpeChildrenInfo;
import org.jboss.tools.vpe.editor.template.VpeCreationData;
+import org.jboss.tools.vpe.editor.util.Constants;
import org.jboss.tools.vpe.editor.util.HTML;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
@@ -31,19 +33,11 @@
* @author dmaliarevich
*
*/
-public class JsfOptionSelectItemTemplate extends AbstractOutputJsfTemplate /*VpeAbstractTemplate*/ {
+public class JsfOptionSelectItemTemplate extends AbstractOutputJsfTemplate /* VpeAbstractTemplate */{
- public static final String ITEM_DISABLED = "itemDisabled";
+ public static final String EMPTY_STRING = ""; //$NON-NLS-1$
- private static final String CLASS = "class";
- private static final String ITEM_LABEL = "itemLabel";
-
- private static final String DISABLED = "disabled";
- private static final String ENABLED_CLASS = "enabledClass";
- private static final String DISABLED_CLASS = "disabledClass";
-
/* "escape" attribute of f:selectItem */
- private static final String ESCAPE = "escape";
private String escape;
private String disabled;
@@ -59,8 +53,10 @@
/*
* (non-Javadoc)
*
- * @see org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools.vpe.editor.context.VpePageContext,
- * org.w3c.dom.Node, org.mozilla.interfaces.nsIDOMDocument)
+ * @see
+ * org.jboss.tools.vpe.editor.template.VpeTemplate#create(org.jboss.tools
+ * .vpe.editor.context.VpePageContext, org.w3c.dom.Node,
+ * org.mozilla.interfaces.nsIDOMDocument)
*/
public VpeCreationData create(VpePageContext pageContext, Node sourceNode,
nsIDOMDocument visualDocument) {
@@ -69,69 +65,98 @@
readAttributes(sourceNode);
Element element = (Element) sourceNode;
boolean disabledItem = ComponentUtil.string2boolean(ComponentUtil
- .getAttribute(element, ITEM_DISABLED));
+ .getAttribute(element, JSF.ATTR_ITEM_DISABLED));
nsIDOMElement option = visualDocument.createElement(HTML.TAG_OPTION);
- // nsIDOMElement span = visualDocument.createElement(HTML.TAG_SPAN);
- // option.appendChild(span);
+
if (disabledItem)
- option.setAttribute(DISABLED, "true");
+
+ option.setAttribute(HTML.ATTR_DISABLED, Constants.TRUE);
VpeCreationData creationData = new VpeCreationData(option);
- if (attrPresents(disabled) && "true".equalsIgnoreCase(disabled)) {
- option.setAttribute(CLASS, disabledClass);
+ if (attrPresents(disabled) && Constants.TRUE.equalsIgnoreCase(disabled)) {
+ option.setAttribute(HTML.ATTR_CLASS, disabledClass);
} else if (attrPresents(enabledClass)) {
- option.setAttribute(CLASS, enabledClass);
+ option.setAttribute(HTML.ATTR_CLASS, enabledClass);
}
-
- processOutputAttribute(pageContext, visualDocument, element, option, creationData);
-// Attr attr = null;
-// if (element.hasAttribute(ITEM_LABEL)) {
-// attr = element.getAttributeNode(ITEM_LABEL);
-// }
-//
-// VpeElementProxyData elementData = new VpeElementProxyData();
-//
-// if (null != attr) {
-// if (null == escape || "true".equalsIgnoreCase(escape)) {
-// // show text as is
-// String itemLabel = attr.getNodeValue();
-// String bundleValue = ComponentUtil.getBundleValue(pageContext,
-// attr);
-// nsIDOMText text;
-// // if bundleValue differ from value then will be represent
-// // bundleValue, but text will be not edit
-// if (!itemLabel.equals(bundleValue)) {
-// text = visualDocument.createTextNode(bundleValue);
-//
-// } else {
-// text = visualDocument.createTextNode(itemLabel);
-//
-// elementData.addNodeData(new AttributeData(attr,
-// option, true));
-// creationData.setElementData(elementData);
-// }
-//
-//
-// option.appendChild(text);
-// } else {
-// // show formatted text
-// VpeChildrenInfo spanInfo = new VpeChildrenInfo(option);
-// // re-parse attribute's value
-// NodeList list = NodeProxyUtil.reparseAttributeValue(elementData,attr);
-// // add children to info
-// for (int i = 0; i < list.getLength(); i++) {
-// Node child = list.item(i);
-// // add info to creation data
-// spanInfo.addSourceChild(child);
-// }
-// creationData.addChildrenInfo(spanInfo);
-// }
-// }
-//
+ processOutputAttribute(pageContext, visualDocument, element, option,
+ creationData);
+
return creationData;
}
+ protected void processOutputAttribute(VpePageContext pageContext,
+ nsIDOMDocument visualDocument, Element sourceElement,
+ nsIDOMElement targetVisualElement, VpeCreationData creationData) {
+
+ VpeElementProxyData elementData = new VpeElementProxyData();
+
+ Attr outputAttr = getOutputAttributeNode(sourceElement);
+
+ if (outputAttr != null) {
+
+ // prepare value
+ String newValue = prepareAttrValue(pageContext, sourceElement,
+ outputAttr);
+
+ // if escape then contents of value (or other attribute) is only
+ // text
+ if (!sourceElement.hasAttribute(JSF.ATTR_ESCAPE)
+ || Constants.TRUE.equalsIgnoreCase(sourceElement //$NON-NLS-1$
+ .getAttribute(JSF.ATTR_ESCAPE))) {
+
+ String value = outputAttr.getNodeValue();
+
+ nsIDOMText text;
+ // if bundleValue differ from value then will be represent
+ // bundleValue, but text will be not edit
+ boolean isEditable = value.equals(newValue);
+
+ text = visualDocument.createTextNode(newValue);
+ // add attribute for ability of editing
+
+ elementData.addNodeData(new AttributeData(outputAttr,
+ targetVisualElement, isEditable));
+
+ targetVisualElement.appendChild(text);
+
+ }
+ // then text can be html code
+ else {
+
+ // create info
+ VpeChildrenInfo targetVisualInfo = new VpeChildrenInfo(
+ targetVisualElement);
+
+ // get atribute's offset
+ int offset = ((IDOMAttr) outputAttr)
+ .getValueRegionStartOffset();
+
+ // reparse attribute's value
+ NodeList list = NodeProxyUtil.reparseAttributeValue(
+ elementData, newValue, offset + 1);
+
+ // add children to info
+ for (int i = 0; i < list.getLength(); i++) {
+
+ Node child = list.item(i);
+
+ // add info to creation data
+ targetVisualInfo.addSourceChild(child);
+ }
+
+ elementData.addNodeData(new AttributeData(outputAttr,
+ targetVisualElement, false));
+
+ creationData.addChildrenInfo(targetVisualInfo);
+
+ }
+
+ }
+
+ creationData.setElementData(elementData);
+ }
+
/**
* Checks is attribute presents.
*
@@ -141,7 +166,7 @@
* @return true, if successful
*/
private boolean attrPresents(String attr) {
- return ((null != attr) && (!"".equals(attr)));
+ return ((null != attr) && (!Constants.EMPTY.equals(attr)));
}
/**
@@ -155,9 +180,9 @@
return;
}
Element source = (Element) sourceNode;
- disabled = source.getAttribute(DISABLED);
- enabledClass = source.getAttribute(ENABLED_CLASS);
- disabledClass = source.getAttribute(DISABLED_CLASS);
+ disabled = source.getAttribute(HTML.ATTR_DISABLED);
+ enabledClass = source.getAttribute(JSF.ATTR_ENABLED_CLASS);
+ disabledClass = source.getAttribute(JSF.ATTR_DISABLED_CLASS);
}
/**
@@ -171,16 +196,9 @@
return;
}
Element source = (Element) sourceNode;
- escape = source.getAttribute(ESCAPE);
+ escape = source.getAttribute(JSF.ATTR_ESCAPE);
}
- /*
- * @Override public void setSourceAttributeSelection(VpePageContext
- * pageContext, Element sourceElement, int offset, int length, Object data) {
- * VpeSourceDomBuilder sourceBuilder = pageContext.getSourceBuilder();
- * sourceBuilder.setSelection(sourceElement, 0, 0); }
- */
-
@Override
protected Attr getOutputAttributeNode(Element element) {
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/JSF.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/JSF.java 2008-07-09 14:29:11 UTC (rev 9107)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/util/JSF.java 2008-07-09 16:29:54 UTC (rev 9108)
@@ -44,5 +44,7 @@
public static final String ATTR_ROWS = "rows"; //$NON-NLS-1$
public static final String ATTR_COLS = "cols"; //$NON-NLS-1$
+
+ public static final String ATTR_ITEM_DISABLED = "itemDisabled"; //$NON-NLS-1$
}
Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java 2008-07-09 16:29:54 UTC (rev 9108)
@@ -0,0 +1,9 @@
+package org.jboss.tools.vpe.editor.util;
+
+public class Constants {
+
+ public static final String TRUE = "true"; //$NON-NLS-1$
+ public static final String FALSE = "false"; //$NON-NLS-1$
+ public static final String EMPTY = ""; //$NON-NLS-1$
+
+}
15 years, 10 months
JBoss Tools SVN: r9107 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-09 10:29:11 -0400 (Wed, 09 Jul 2008)
New Revision: 9107
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml
Log:
Fix bug http://jira.jboss.com/jira/browse/JBIDE-2405
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 2008-07-09 14:26:38 UTC (rev 9106)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/templates/vpe-templates-jsf.xml 2008-07-09 14:29:11 UTC (rev 9107)
@@ -120,6 +120,11 @@
</vpe:tag>
<vpe:tag name="h:outputText" case-sensitive="yes">
+ <vpe:if test="hasinparents('rich:progressBar')">
+ <vpe:template children="yes" modify="no">
+ <span style="display:none;"/>
+ </vpe:template>
+ </vpe:if>
<vpe:template children="yes" modify="no"
class="org.jboss.tools.jsf.vpe.jsf.template.JsfOutputTextTemplate">
<vpe:dnd>
15 years, 10 months
JBoss Tools SVN: r9106 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-07-09 10:26:38 -0400 (Wed, 09 Jul 2008)
New Revision: 9106
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java
Log:
Fix bug http://jira.jboss.com/jira/browse/JBIDE-2405
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java 2008-07-09 13:25:33 UTC (rev 9105)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesProgressBarTemplate.java 2008-07-09 14:26:38 UTC (rev 9106)
@@ -13,6 +13,8 @@
package org.jboss.tools.jsf.vpe.richfaces.template;
+import java.awt.Component;
+import java.util.ArrayList;
import java.util.List;
import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
@@ -23,11 +25,12 @@
import org.jboss.tools.vpe.editor.template.VpeCreationData;
import org.jboss.tools.vpe.editor.util.HTML;
import org.jboss.tools.vpe.editor.util.VpeStyleUtil;
-import org.jboss.tools.vpe.xulrunner.browser.util.DOMTreeDumper;
import org.mozilla.interfaces.nsIDOMDocument;
import org.mozilla.interfaces.nsIDOMElement;
+import org.mozilla.interfaces.nsIDOMNode;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
/**
@@ -101,13 +104,30 @@
}
progressDiv.setAttribute(HTML.ATTR_CLASS, clazz);
progressDiv.setAttribute(HTML.ATTR_STYLE, this.style + TEXT_ALIGN_LEFT);
- if(ComponentUtil.isNotBlank(this.sourceLabel)){
+ final List<Node> elements = new ArrayList<Node>();
+ final NodeList list = sourceNode.getChildNodes();
+
+ for(int i = 0 ; i < list.getLength() ; i ++ ){
+ if(list.item(i).getNodeName().equalsIgnoreCase("h:outputText")){
+ elements.add(list.item(i));
+ }
+ }
+
+ if(ComponentUtil.isNotBlank(this.sourceLabel) || elements.size() > 0){
final nsIDOMElement labelDiv = visualDocument.createElement(HtmlComponentUtil.HTML_TAG_DIV);
// labelDiv.setAttribute(HTML.ATTR_CLASS, "rich-progress-bar-width rich-progress-bar-remained rich-progress-bar-padding");
labelDiv.setAttribute(HTML.ATTR_STYLE,this.style+"; font-weight: bold; position: relative; text-align: center; ");
uploadDiv.appendChild(labelDiv);
-
- labelDiv.appendChild(visualDocument.createTextNode(this.sourceLabel));
+ if (elements.size() > 0) {
+ final StringBuffer sb = new StringBuffer();
+
+ for (Node n : elements) {
+ sb.append(ComponentUtil.getAttribute((Element)n, "value"));
+ }
+ labelDiv.appendChild(visualDocument.createTextNode(sb.toString()));
+ } else {
+ labelDiv.appendChild(visualDocument.createTextNode(this.sourceLabel));
+ }
}
uploadDiv.setAttribute(HTML.ATTR_CLASS, UPLOADED_DIV);
15 years, 10 months