October 2009 - jbosstools-commits

JBoss Tools SVN: r18199 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: editor and 4 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2009-10-21 06:06:10 -0400 (Wed, 21 Oct 2009) New Revision: 18199 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksTaskDetailsEditorSite.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/BeanReferenceConnectionEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/TriggerConnectionEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/ValueBindingConnectionEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataContianerModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataTreeNodeModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java Log: JBIDE-5067 1. Change the line style. 2. Fix bug : graphical viewer can refresh when source was changed. 3. Fix bug : when change the model in graphical viewer , can't notify the source tab change the text. Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-10-21 10:05:51 UTC (rev 18198) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-10-21 10:06:10 UTC (rev 18199) @@ -2475,9 +2475,6 @@ input.getParam().addAll(params); Command command = AddCommand.create(domain, extType, GraphPackage.Literals.SMOOKS_GRAPHICS_EXT_TYPE__INPUT, input); - if (command.canExecute()) { - System.out.println("aaa"); - } domain.getCommandStack().execute(command); // extType.getInput().add(input); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2009-10-21 10:05:51 UTC (rev 18198) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2009-10-21 10:06:10 UTC (rev 18199) @@ -160,12 +160,6 @@ } } }); - - // - // if (propertySheetPage != null && - // !propertySheetPage.getControl().isDisposed()) { - // propertySheetPage.refresh(); - // } } }); } @@ -526,7 +520,7 @@ ProcessType process = GraphFactory.eINSTANCE.createProcessType(); processes.setProcess(process); smooksGraphicsExt.setProcesses(processes); - }else{ + } else { if (smooksGraphicsExt.getProcesses().getProcess() == null) { ProcessesType processes = smooksGraphicsExt.getProcesses(); ProcessType process = GraphFactory.eINSTANCE.createProcessType(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java 2009-10-21 10:05:51 UTC (rev 18198) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java 2009-10-21 10:06:10 UTC (rev 18199) @@ -149,6 +149,7 @@ @Override public void paintFigure(Graphics graphics) { graphics.setAlpha(alpha); + graphics.setLineWidth(3); super.paintFigure(graphics); } @@ -191,7 +192,6 @@ return list; } }; - connection.setConnectionRouter(new ManhattanConnectionRouter()); return connection; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java 2009-10-21 10:05:51 UTC (rev 18198) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java 2009-10-21 10:06:10 UTC (rev 18199) @@ -36,12 +36,9 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.jboss.tools.smooks.configuration.editors.actions.ISmooksActionGrouper; import org.jboss.tools.smooks.configuration.editors.actions.JavaBean11ActionGrouper; -import org.jboss.tools.smooks.configuration.editors.actions.Templating11ActionGrouper; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.editor.ISmooksModelProvider; -import org.jboss.tools.smooks.gef.tree.model.BeanReferenceConnection; import org.jboss.tools.smooks.gef.tree.model.TriggerConnection; -import org.jboss.tools.smooks.gef.tree.model.ValueBindingConnection; import org.jboss.tools.smooks.model.javabean.BindingsType; import org.jboss.tools.smooks.model.javabean12.BeanType; import org.jboss.tools.smooks.model.smooks.ConditionType; @@ -102,33 +99,6 @@ for (Iterator<?> iterator = grouperList.iterator(); iterator.hasNext();) { ISmooksActionGrouper iSmooksActionGrouper = (ISmooksActionGrouper) iterator.next(); PaletteDrawer drawer = new PaletteDrawer(iSmooksActionGrouper.getGroupName()); - - if(iSmooksActionGrouper instanceof JavaBean11ActionGrouper){ - CreationFactory factory = new CreationFactory() { - - public Object getObjectType() { - return BeanReferenceConnection.class; - } - - public Object getNewObject() { - return null; - } - }; - drawer.add(new ConnectionCreationToolEntry("Bean Ref Link", "Bean Ref Link", factory, null, null)); - - CreationFactory factory1 = new CreationFactory() { - - public Object getObjectType() { - return ValueBindingConnection.class; - } - - public Object getNewObject() { - return null; - } - }; - drawer.add(new ConnectionCreationToolEntry("Value Binding Link", "Value Binding Link", factory1, null, null)); - } - fillDrawer(drawer, newChildrenDescripter, iSmooksActionGrouper); root.add(drawer); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-10-21 10:05:51 UTC (rev 18198) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-10-21 10:06:10 UTC (rev 18199) @@ -40,8 +40,6 @@ import org.eclipse.gef.ui.actions.SelectionAction; import org.eclipse.gef.ui.parts.GraphicalEditorWithPalette; import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler; -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.util.TransferDropTargetListener; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ISelection; @@ -50,20 +48,14 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorSite; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.actions.ActionFactory; -import org.eclipse.ui.forms.events.HyperlinkEvent; -import org.eclipse.ui.forms.events.IHyperlinkListener; +import org.eclipse.ui.forms.editor.FormPage; import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.Hyperlink; -import org.eclipse.ui.forms.widgets.ScrolledPageBook; -import org.jboss.tools.smooks.configuration.SmooksConstants; import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject; import org.jboss.tools.smooks.configuration.editors.SelectorCreationDialog; import org.jboss.tools.smooks.configuration.editors.javabean.JavaBeanModel; @@ -72,7 +64,6 @@ import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.configuration.editors.xml.XMLStructuredDataContentProvider; import org.jboss.tools.smooks.configuration.editors.xml.XMLStructuredDataLabelProvider; -import org.jboss.tools.smooks.editor.AbstractSmooksFormEditor; import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.editor.ISourceSynchronizeListener; import org.jboss.tools.smooks.gef.common.RootModel; @@ -95,10 +86,7 @@ import org.jboss.tools.smooks.model.graphics.ext.FigureType; import org.jboss.tools.smooks.model.graphics.ext.GraphType; import org.jboss.tools.smooks.model.graphics.ext.ISmooksGraphChangeListener; -import org.jboss.tools.smooks.model.graphics.ext.ProcessType; -import org.jboss.tools.smooks.model.graphics.ext.ProcessesType; import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; -import org.jboss.tools.smooks.model.graphics.ext.TaskType; import org.jboss.tools.smooks.model.smooks.DocumentRoot; import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; import org.jboss.tools.smooks.model.validation10.RuleType; @@ -110,16 +98,12 @@ public class SmooksGraphicalEditorPart extends GraphicalEditorWithPalette implements ISelectionChangedListener, ISourceSynchronizeListener, ISmooksGraphChangeListener { - private List<IAction> processPanelActions = new ArrayList<IAction>(); - public static final int EXECUTE_COMMAND = 0; public static final int REDO_COMMAND = 1; public static final int UNDO_COMMAND = 2; - private Object emptyKey = new Object(); - private DefaultEditDomain editDomain = null; private ISmooksModelProvider smooksModelProvider = null; @@ -134,10 +118,6 @@ private ConnectionModelFactory connectionModelFactory; - // private GraphViewer processGraphViewer; - - private ScrolledPageBook pageBook; - public SmooksGraphicalEditorPart(ISmooksModelProvider provider) { super(); this.editDomain = new DefaultEditDomain(this); @@ -174,239 +154,24 @@ this.setEditDomain(editDomain); } - protected void createProcessGraphicalPanel(Composite parent) { - // processGraphViewer = new GraphViewer(parent, SWT.NONE); - // processGraphViewer.setContentProvider(new - // ProcessGraphContentProvider()); - // - // processGraphViewer.setLabelProvider(new LabelProvider() { - // - // @Override - // public Image getImage(Object element) { - // // TODO Auto-generated method stub - // return super.getImage(element); - // } - // - // @Override - // public String getText(Object element) { - // if (element instanceof TaskType) { - // String id = ((TaskType) element).getId(); - // String name = ((TaskType) element).getName(); - // if (name == null) { - // name = id; - // } - // if (name == null) { - // name = "null"; - // } - // return name; - // } - // return ""; - // } - // - // }); - // processGraphViewer.setConnectionStyle(ZestStyles.CONNECTIONS_DIRECTED); - // HorizontalTreeLayoutAlgorithm layoutAlgorithm = new - // HorizontalTreeLayoutAlgorithm( - // LayoutStyles.NO_LAYOUT_NODE_RESIZING); - // processGraphViewer.setLayoutAlgorithm(layoutAlgorithm, true); - // if (parent instanceof Section) { - // ((Section) parent).setClient(processGraphViewer.getControl()); - // } - } - - protected void initProcessGraphicalViewer() { - SmooksGraphicsExtType ext = this.smooksModelProvider.getSmooksGraphicsExt(); - ProcessesType processes = ext.getProcesses(); - ProcessType process = null; - if (processes != null) { - process = processes.getProcess(); - } - - if (process != null) { - // getProcessGraphViewer().setInput(process); - } - } - - protected void configProcessGraphicalViewer() { - // MenuManager manager = new MenuManager(); - // - // initProcessGraphicalPanelActions(manager); - // - // Menu menu = - // manager.createContextMenu(getProcessGraphViewer().getControl()); - // getProcessGraphViewer().getControl().setMenu(menu); - // manager.addMenuListener(new IMenuListener() { - // - // public void menuAboutToShow(IMenuManager manager) { - // for (Iterator<?> iterator = processPanelActions.iterator(); - // iterator.hasNext();) { - // IAction a = (IAction) iterator.next(); - // if (a instanceof AbstractProcessGraphAction) { - // ((AbstractProcessGraphAction) a).selectionChanged(new - // SelectionChangedEvent(processGraphViewer, - // processGraphViewer.getSelection())); - // } - // } - // manager.update(); - // } - // }); - } - - protected void initProcessGraphicalPanelActions(IMenuManager manager) { - - // AddTaskNodeAction addInputTaskAction = new - // AddTaskNodeAction(SmooksConstants.TASK_ID_INPUT, "Add Input Task", - // smooksModelProvider) { - // - // @Override - // public void run() { - // if (this.provider != null) { - // SmooksGraphicsExtType graph = provider.getSmooksGraphicsExt(); - // ProcessType process = graph.getProcesses().getProcess(); - // if (process != null && process.getTask().isEmpty()) { - // TaskType childTask = GraphFactory.eINSTANCE.createTaskType(); - // childTask.setId(taskID); - // childTask.setName("Input Task"); - // Command command = AddCommand.create(provider.getEditingDomain(), - // process, - // GraphPackage.Literals.PROCESS_TYPE__TASK, childTask); - // provider.getEditingDomain().getCommandStack().execute(command); - // } - // } - // } - // - // @Override - // public void update() { - // this.setEnabled(false); - // SmooksGraphicsExtType graph = - // smooksModelProvider.getSmooksGraphicsExt(); - // ProcessType process = graph.getProcesses().getProcess(); - // if (process != null && process.getTask().isEmpty()) { - // this.setEnabled(true); - // } - // } - // - // }; - // manager.add(addInputTaskAction); - // processPanelActions.add(addInputTaskAction); - // - // MenuManager addNextTaskMenuManager = new - // MenuManager("Add Next Task"); - // manager.add(addNextTaskMenuManager); - // - // AddNextTaskNodeAction addNextInputAction = new - // AddNextTaskNodeAction(SmooksConstants.TASK_ID_INPUT, "Input", - // smooksModelProvider); - // this.processPanelActions.add(addNextInputAction); - // addNextTaskMenuManager.add(addNextInputAction); - // - // AddNextTaskNodeAction addNextJavaMappingAction = new - // AddNextTaskNodeAction( - // SmooksConstants.TASK_ID_JAVA_MAPPING, "Java Mapping", - // smooksModelProvider); - // this.processPanelActions.add(addNextJavaMappingAction); - // addNextTaskMenuManager.add(addNextJavaMappingAction); - // - // MenuManager addPreTaskMenuManager = new - // MenuManager("Add Previous Task"); - // manager.add(addPreTaskMenuManager); - // - // AddPreviousTaskNodeAction addPreInputAction = new - // AddPreviousTaskNodeAction(SmooksConstants.TASK_ID_INPUT, - // "Input", smooksModelProvider); - // this.processPanelActions.add(addPreInputAction); - // addPreTaskMenuManager.add(addPreInputAction); - // - // AddPreviousTaskNodeAction addPreJavaMappingAction = new - // AddPreviousTaskNodeAction( - // SmooksConstants.TASK_ID_JAVA_MAPPING, "Java Mapping", - // smooksModelProvider); - // this.processPanelActions.add(addPreJavaMappingAction); - // addPreTaskMenuManager.add(addPreJavaMappingAction); - // - // DeleteTaskNodeAction deleteAction = new - // DeleteTaskNodeAction(smooksModelProvider); - // manager.add(deleteAction); - // - // this.processPanelActions.add(deleteAction); - // - // getProcessGraphViewer().addSelectionChangedListener(new - // ISelectionChangedListener() { - // - // public void selectionChanged(SelectionChangedEvent event) { - // IStructuredSelection selection = (IStructuredSelection) - // event.getSelection(); - // Object firstElement = selection.getFirstElement(); - // showTaskControl(firstElement); - // } - // }); - } - - // public GraphViewer getProcessGraphViewer() { - // return processGraphViewer; - // } - @Override public void createPartControl(Composite parent) { - // FormToolkit toolkit = ((AbstractSmooksFormEditor) - // this.smooksModelProvider).getToolkit(); - // Composite composite = new Composite(parent, SWT.NONE); - // composite.setBackground(toolkit.getColors().getBackground()); - // - // FillLayout fillLayout = new FillLayout(); - // fillLayout.marginWidth = 5; - // fillLayout.marginHeight = 5; - // composite.setLayout(fillLayout); - // - // SashForm sashForm = new SashForm(composite, SWT.VERTICAL); - // sashForm.SASH_WIDTH = 1; - // - // Section processGraphSection = toolkit.createSection(sashForm, - // Section.DESCRIPTION | Section.TITLE_BAR); - // processGraphSection.setText("Process Map"); - // processGraphSection.setDescription("Right-Click to open the PopMenu to add or remove task node"); - // - // Composite processGraphComposite = - // toolkit.createComposite(processGraphSection); - // - // FillLayout processGraphFillLayout = new FillLayout(); - // processGraphFillLayout.marginWidth = 1; - // processGraphFillLayout.marginHeight = 1; - // processGraphComposite.setLayout(processGraphFillLayout); - // - // processGraphComposite.setBackground(toolkit.getColors().getBorderColor()); - // - // processGraphSection.setClient(processGraphComposite); - // - // createProcessGraphicalPanel(processGraphComposite); - // configProcessGraphicalViewer(); - // initProcessGraphicalViewer(); - // - // Composite taskDetailsComposite = toolkit.createComposite(sashForm); - // FillLayout taskDetailsFillLayout = new FillLayout(); - // taskDetailsFillLayout.marginWidth = 0; - // taskDetailsFillLayout.marginHeight = 5; - // taskDetailsComposite.setLayout(taskDetailsFillLayout); - // - // Section section = toolkit.createSection(taskDetailsComposite, - // Section.DESCRIPTION | Section.TITLE_BAR); - // section.setText("Task Configuration"); - // section.setDescription("Configurate the selected task"); - // pageBook = new ScrolledPageBook(section); - // pageBook.setBackground(toolkit.getColors().getBackground()); - // section.setClient(pageBook); - // - // sashForm.setWeights(new int[] { 4, 6 }); - // - // Composite emptyComposite = pageBook.createPage(emptyKey); - // emptyComposite.setLayout(new FillLayout()); - // createEmptyTaskPanel(emptyComposite, toolkit); - // pageBook.showPage(emptyKey); - super.createPartControl(parent); + IEditorSite site = getEditorSite(); + if (site instanceof SmooksTaskDetailsEditorSite) { + FormPage page = ((SmooksTaskDetailsEditorSite) site).getParentEditor(); + FormToolkit tool = page.getManagedForm().getToolkit(); + Composite mainComposite = tool.createComposite(parent); + mainComposite.setBackground(tool.getColors().getBorderColor()); + FillLayout fillLayout = new FillLayout(); + fillLayout.marginHeight = 1; + fillLayout.marginWidth = 1; + mainComposite.setLayout(fillLayout); + super.createPartControl(mainComposite); + return; + } - // pageBook.showPage(pageBook); - + super.createPartControl(parent); } private void handleCommandStack(org.eclipse.emf.common.command.CommandStack commandStack) { @@ -834,7 +599,7 @@ containerModel.getChildren().add((IXMLStructuredObject) object); if (containerModel != null) { TreeContainerModel container = new InputDataContianerModel(containerModel, contentProvider, - labelProvider); + labelProvider, getSmooksModelProvider()); root.addTreeNode(container); inputGraphModel.add(container); } @@ -919,7 +684,6 @@ connections.addAll(c1); } this.createConnection(model.getChildren(), connections); - List<AbstractSmooksGraphicalModel> children = model.getChildren(); // for (Iterator<?> iterator = children.iterator(); // iterator.hasNext();) { // AbstractSmooksGraphicalModel abstractSmooksGraphicalModel = @@ -1178,81 +942,6 @@ updateActions(getSelectionActions()); } - protected Control createTaskPanel(Composite parent, FormToolkit toolkit, String taskID) { - - if (taskID == null) - return null; - - if (taskID.equals(SmooksConstants.TASK_ID_JAVA_MAPPING)) { - parent.setBackground(toolkit.getColors().getBorderColor()); - - FillLayout detailsFillLayout = new FillLayout(); - detailsFillLayout.marginWidth = 1; - detailsFillLayout.marginHeight = 1; - parent.setLayout(detailsFillLayout); - - super.createPartControl(parent); - return parent; - } - - if (taskID.equals(SmooksConstants.TASK_ID_INPUT)) { - GridLayout gl = new GridLayout(); - gl.numColumns = 2; - parent.setLayout(gl); - toolkit.createLabel(parent, - "Click the link to switch to the \"Input\" tab to configurate the Smooks Input : "); - Hyperlink link = toolkit.createHyperlink(parent, "Go to the Input page", SWT.NONE); - link.addHyperlinkListener(new IHyperlinkListener() { - - public void linkExited(HyperlinkEvent e) { - - } - - public void linkEntered(HyperlinkEvent e) { - - } - - public void linkActivated(HyperlinkEvent e) { - if (smooksModelProvider instanceof AbstractSmooksFormEditor) { - ((AbstractSmooksFormEditor) smooksModelProvider).setActivePage("reader_page"); - } - } - }); - - return parent; - } - - return null; - } - - protected void showTaskControl(Object model) { - FormToolkit toolkit = ((AbstractSmooksFormEditor) this.smooksModelProvider).getToolkit(); - if (model instanceof TaskType) { - String id = ((TaskType) model).getId(); - if (id != null) { - if (!pageBook.hasPage(id)) { - Composite parent = pageBook.createPage(id); - Control control = createTaskPanel(parent, toolkit, id); - if (control != null) { - pageBook.showPage(id); - } else { - pageBook.removePage(id); - pageBook.showPage(emptyKey); - } - } else { - pageBook.showPage(id); - } - } - } else { - // pageBook.showEmptyPage(); - } - } - - protected Control createEmptyTaskPanel(Composite parent, FormToolkit toolkit) { - parent.setLayout(new FillLayout()); - return toolkit.createLabel(parent, "Select the task node"); - } - public void sourceChange(Object model) { initGraphicalModel(); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2009-10-21 10:05:51 UTC (rev 18198) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2009-10-21 10:06:10 UTC (rev 18199) @@ -56,7 +56,6 @@ import org.eclipse.ui.forms.widgets.ScrolledForm; import org.eclipse.ui.forms.widgets.ScrolledPageBook; import org.eclipse.ui.forms.widgets.Section; -import org.eclipse.ui.part.MultiPageEditorSite; import org.eclipse.zest.core.viewers.GraphViewer; import org.eclipse.zest.core.widgets.ZestStyles; import org.eclipse.zest.layouts.LayoutStyles; @@ -559,7 +558,7 @@ } protected IEditorSite createSite(IEditorPart editor) { - return new MultiPageEditorSite(this.getEditor(), editor); + return new SmooksTaskDetailsEditorSite(this.getEditor(), editor, this); } protected void createTaskPage(IEditorPart editorPart, Composite parent) throws PartInitException { @@ -578,18 +577,43 @@ } public void sourceChange(Object model) { + Collection<Object> editors = registedTaskPages.values(); + for (Iterator<?> iterator = editors.iterator(); iterator.hasNext();) { + Object object = (Object) iterator.next(); + if (object instanceof ISmooksGraphChangeListener) { + ((ISourceSynchronizeListener) object).sourceChange(model); + } + } } public void graphChanged(SmooksGraphicsExtType extType) { - + Collection<Object> editors = registedTaskPages.values(); + for (Iterator<?> iterator = editors.iterator(); iterator.hasNext();) { + Object object = (Object) iterator.next(); + if (object instanceof ISmooksGraphChangeListener) { + ((ISmooksGraphChangeListener) object).graphChanged(extType); + } + } } public void graphPropertyChange(EStructuralFeature featre, Object value) { - + Collection<Object> editors = registedTaskPages.values(); + for (Iterator<?> iterator = editors.iterator(); iterator.hasNext();) { + Object object = (Object) iterator.next(); + if (object instanceof ISmooksGraphChangeListener) { + ((ISmooksGraphChangeListener) object).graphPropertyChange(featre, value); + } + } } public void inputTypeChanged(SmooksGraphicsExtType extType) { - + Collection<Object> editors = registedTaskPages.values(); + for (Iterator<?> iterator = editors.iterator(); iterator.hasNext();) { + Object object = (Object) iterator.next(); + if (object instanceof ISmooksGraphChangeListener) { + ((ISmooksGraphChangeListener) object).inputTypeChanged(extType); + } + } } public void propertyChanged(Object source, int propId) { Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksTaskDetailsEditorSite.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksTaskDetailsEditorSite.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksTaskDetailsEditorSite.java 2009-10-21 10:06:10 UTC (rev 18199) @@ -0,0 +1,48 @@ +/******************************************************************************* + * Copyright (c) 2008 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.smooks.graphical.editors; + +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.forms.editor.FormPage; +import org.eclipse.ui.part.MultiPageEditorPart; +import org.eclipse.ui.part.MultiPageEditorSite; + +/** + * @author Dart + * + */ +public class SmooksTaskDetailsEditorSite extends MultiPageEditorSite { + + private FormPage parentEditor = null; + + public SmooksTaskDetailsEditorSite(MultiPageEditorPart multiPageEditor, IEditorPart editor, + FormPage parentEditor) { + super(multiPageEditor, editor); + this.parentEditor = parentEditor; + } + + /** + * @return the parentEditor + */ + public FormPage getParentEditor() { + return parentEditor; + } + + /** + * @param parentEditor the parentEditor to set + */ + public void setParentEditor(FormPage parentEditor) { + this.parentEditor = parentEditor; + } + + + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksTaskDetailsEditorSite.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/BeanReferenceConnectionEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/BeanReferenceConnectionEditPart.java 2009-10-21 10:05:51 UTC (rev 18198) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/BeanReferenceConnectionEditPart.java 2009-10-21 10:06:10 UTC (rev 18199) @@ -11,17 +11,21 @@ package org.jboss.tools.smooks.graphical.editors.editparts; -import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Connection; import org.eclipse.draw2d.ConnectionAnchor; import org.eclipse.draw2d.Graphics; -import org.eclipse.draw2d.ManhattanConnectionRouter; import org.eclipse.draw2d.PolylineConnection; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.PointList; +import org.eclipse.gef.DefaultEditDomain; import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.LineAttributes; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IEditorSite; +import org.eclipse.ui.forms.editor.FormPage; import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart; import org.jboss.tools.smooks.gef.tree.figures.LeftOrRightAnchor; +import org.jboss.tools.smooks.graphical.editors.SmooksTaskDetailsEditorSite; /** * @author Dart @@ -39,8 +43,6 @@ @Override public void paintFigure(Graphics graphics) { graphics.setAlpha(alpha); - graphics.setForegroundColor(ColorConstants.darkBlue); - graphics.setLineStyle(Graphics.LINE_DASHDOTDOT); super.paintFigure(graphics); } @@ -83,8 +85,19 @@ return list; } }; - - connection.setConnectionRouter(new ManhattanConnectionRouter()); + DefaultEditDomain domain = (DefaultEditDomain) getViewer().getEditDomain(); + IEditorPart editorPart = domain.getEditorPart(); + IEditorSite site = editorPart.getEditorSite(); + if(site instanceof SmooksTaskDetailsEditorSite){ + FormPage page = ((SmooksTaskDetailsEditorSite)site).getParentEditor(); + connection.setForegroundColor(page.getManagedForm().getToolkit().getColors().getBorderColor()); + + } + connection.setLineStyle(Graphics.LINE_CUSTOM); + connection.setLineDash(new float[]{10,5}); + connection.setLineCap(SWT.CAP_ROUND); +// connection.set +// connection.setConnectionRouter(new ManhattanConnectionRouter()); return connection; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java 2009-10-21 10:05:51 UTC (rev 18198) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java 2009-10-21 10:06:10 UTC (rev 18199) @@ -19,12 +19,17 @@ import org.eclipse.draw2d.Label; import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; +import org.eclipse.swt.graphics.Image; import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; +import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.gef.tree.editparts.TreeContainerEditPart; import org.jboss.tools.smooks.gef.tree.figures.TreeContainerFigure; import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel; import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; +import org.jboss.tools.smooks.graphical.editors.model.InputDataContianerModel; +import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; +import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils; /** * @author Dart @@ -32,6 +37,8 @@ */ public class InputDataContainerEditPart extends TreeContainerEditPart { + private String inputType = null; + @Override public void propertyChange(PropertyChangeEvent evt) { super.propertyChange(evt); @@ -158,14 +165,65 @@ */ @Override protected void refreshVisuals() { - TreeContainerFigure figure = (TreeContainerFigure) getFigure(); - // if(i != null){ - // figure.setIcon(i); - // } - figure.getLabel().setTextAlignment(Label.LEFT); - figure.setText("Input Model"); - figure.setIcon(SmooksConfigurationActivator.getDefault().getImageRegistry().get( - GraphicsConstants.IMAGE_INPUT_DATA_HEADER)); + InputDataContianerModel model = (InputDataContianerModel) getModel(); + ISmooksModelProvider provider = model.getSmooksModelProvider(); + SmooksGraphicsExtType ext = provider.getSmooksGraphicsExt(); + if (ext != null) { + + Image image = SmooksConfigurationActivator.getDefault().getImageRegistry().get( + GraphicsConstants.IMAGE_INPUT_DATA_HEADER); + + String text = "Input Model"; + + if (inputType != null) { + if (inputType.equals(ext.getInputType())) { + super.refreshVisuals(); + return; + } + } + inputType = ext.getInputType(); + if (inputType.equals(SmooksModelUtils.INPUT_TYPE_JAVA)) { + image = SmooksConfigurationActivator.getDefault().getImageRegistry().get( + GraphicsConstants.IMAGE_JAVA_FILE); + + text = "Java Input Model"; + } + + if (inputType.equals(SmooksModelUtils.INPUT_TYPE_XML)) { + image = SmooksConfigurationActivator.getDefault().getImageRegistry().get( + GraphicsConstants.IMAGE_XML_FILE); + + text = "XML Input Model"; + } + + if (inputType.equals(SmooksModelUtils.INPUT_TYPE_XSD)) { + image = SmooksConfigurationActivator.getDefault().getImageRegistry().get( + GraphicsConstants.IMAGE_XSD_FILE); + + text = "XSD Input Model"; + } + + if (inputType.equals(SmooksModelUtils.INPUT_TYPE_CSV)) { + + text = "CSV Input Model"; + } + + if (inputType.equals(SmooksModelUtils.INPUT_TYPE_EDI_1_1)) { + + text = "EDI Input Model"; + } + + if (inputType.equals(SmooksModelUtils.INPUT_TYPE_JSON_1_1)) { + + text = "JSON Input Model"; + } + + TreeContainerFigure figure = (TreeContainerFigure) getFigure(); + figure.getLabel().setTextAlignment(Label.LEFT); + figure.setText(text); + figure.setIcon(image); + } + super.refreshVisuals(); } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/TriggerConnectionEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/TriggerConnectionEditPart.java 2009-10-21 10:05:51 UTC (rev 18198) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/TriggerConnectionEditPart.java 2009-10-21 10:06:10 UTC (rev 18199) @@ -11,20 +11,28 @@ package org.jboss.tools.smooks.graphical.editors.editparts; import org.eclipse.draw2d.Connection; +import org.eclipse.draw2d.Shape; import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart; /** * @author Dart - * + * */ public class TriggerConnectionEditPart extends TreeNodeConnectionEditPart { - /* (non-Javadoc) - * @see org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart#createConnectionFigure() + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart# + * createConnectionFigure() */ @Override protected Connection createConnectionFigure() { - return super.createConnectionFigure(); + Connection c = super.createConnectionFigure(); + if (c instanceof Shape) { + ((Shape) c).setLineWidth(2); + } + return c; } - } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/ValueBindingConnectionEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/ValueBindingConnectionEditPart.java 2009-10-21 10:05:51 UTC (rev 18198) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/ValueBindingConnectionEditPart.java 2009-10-21 10:06:10 UTC (rev 18199) @@ -11,7 +11,6 @@ package org.jboss.tools.smooks.graphical.editors.editparts; import org.eclipse.draw2d.Connection; -import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart; /** @@ -26,7 +25,7 @@ @Override protected Connection createConnectionFigure() { Connection connection = super.createConnectionFigure(); - connection.setForegroundColor(GraphicsConstants.BORDER_CORLOER); +// connection.setForegroundColor(GraphicsConstants.BORDER_CORLOER); return connection; } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataContianerModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataContianerModel.java 2009-10-21 10:05:51 UTC (rev 18198) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataContianerModel.java 2009-10-21 10:06:10 UTC (rev 18199) @@ -12,37 +12,68 @@ import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel; import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; -import org.jboss.tools.smooks.gef.tree.model.TriggerConnection; -import org.jboss.tools.smooks.gef.tree.model.ValueBindingConnection; /** * @author Dart * */ public class InputDataContianerModel extends TreeContainerModel { + + private ISmooksModelProvider smooksModelProvider; - public InputDataContianerModel(Object data, ITreeContentProvider contentProvider, ILabelProvider labelProvider) { + public InputDataContianerModel(Object data, ITreeContentProvider contentProvider, ILabelProvider labelProvider, ISmooksModelProvider modelProvider) { super(data, contentProvider, labelProvider); - // TODO Auto-generated constructor stub + this.smooksModelProvider = modelProvider; } @Override protected TreeNodeModel createChildModel(Object model, ITreeContentProvider contentProvider, - ILabelProvider labelProvider) { + ILabelProvider labelProvider ) { return new InputDataTreeNodeModel(model, contentProvider, labelProvider); } + + + /** + * @return the smooksModelProvider + */ + public ISmooksModelProvider getSmooksModelProvider() { + return smooksModelProvider; + } + + /** + * @param smooksModelProvider the smooksModelProvider to set + */ + public void setSmooksModelProvider(ISmooksModelProvider smooksModelProvider) { + this.smooksModelProvider = smooksModelProvider; + } + /* (non-Javadoc) * @see org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel#isLinkable(java.lang.Class) */ @Override public boolean isLinkable(Class<?> connectionType) { - if(connectionType == TriggerConnection.class || connectionType == ValueBindingConnection.class){ - return true; - } + return true; + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithSource(java.lang.Object) + */ + @Override + public boolean canLinkWithSource(Object model) { + return super.canLinkWithSource(model); + } + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithTarget(java.lang.Object) + */ + @Override + public boolean canLinkWithTarget(Object model) { return false; } + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataTreeNodeModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataTreeNodeModel.java 2009-10-21 10:05:51 UTC (rev 18198) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataTreeNodeModel.java 2009-10-21 10:06:10 UTC (rev 18199) @@ -10,15 +10,17 @@ ******************************************************************************/ package org.jboss.tools.smooks.graphical.editors.model; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; +import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; -import org.jboss.tools.smooks.gef.tree.model.TriggerConnection; -import org.jboss.tools.smooks.gef.tree.model.ValueBindingConnection; /** * @author Dart - * + * */ public class InputDataTreeNodeModel extends TreeNodeModel { @@ -32,18 +34,46 @@ ILabelProvider labelProvider) { return new InputDataTreeNodeModel(model, contentProvider, labelProvider); } - - /* (non-Javadoc) - * @see org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel#isLinkable(java.lang.Class) + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel#isLinkable + * (java.lang.Class) */ @Override public boolean isLinkable(Class<?> connectionType) { - if(connectionType == null){ + return true; + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithSource + * (java.lang.Object) + */ + @Override + public boolean canLinkWithSource(Object model) { + return super.canLinkWithSource(model); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithTarget + * (java.lang.Object) + */ + @Override + public boolean canLinkWithTarget(Object model) { + Object data = ((AbstractSmooksGraphicalModel)model).getData(); + data = AdapterFactoryEditingDomain.unwrap(data); + if (SmooksUIUtils.getSelectorFeature((EObject)data) != null) { return true; } - if(connectionType == TriggerConnection.class || connectionType == ValueBindingConnection.class){ - return true; - } return false; } + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java 2009-10-21 10:05:51 UTC (rev 18198) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java 2009-10-21 10:06:10 UTC (rev 18199) @@ -23,7 +23,7 @@ import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; import org.jboss.tools.smooks.configuration.editors.uitls.ProjectClassLoader; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; -import org.jboss.tools.smooks.gef.tree.model.BeanReferenceConnection; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; import org.jboss.tools.smooks.model.javabean.BindingsType; import org.jboss.tools.smooks.model.javabean12.BeanType; @@ -50,7 +50,7 @@ if (connectionType == null) { return true; } - if (connectionType == BeanReferenceConnection.class) { + if (TreeNodeConnection.class.isAssignableFrom(connectionType)) { Object data = this.getData(); data = AdapterFactoryEditingDomain.unwrap(data); if (SmooksUIUtils.getBeanIDRefFeature((EObject)data) != null) {

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18198 - branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-10-21 06:05:51 -0400 (Wed, 21 Oct 2009) New Revision: 18198 Modified: branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebViewsTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-5061 Modified: branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebViewsTest.java =================================================================== --- branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebViewsTest.java 2009-10-21 09:58:47 UTC (rev 18197) +++ branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebViewsTest.java 2009-10-21 10:05:51 UTC (rev 18198) @@ -12,6 +12,7 @@ import junit.framework.TestCase; +import org.eclipse.gef.ui.views.palette.PaletteView; import org.eclipse.ui.IPerspectiveDescriptor; import org.eclipse.ui.IPerspectiveRegistry; import org.eclipse.ui.IViewPart; @@ -65,7 +66,7 @@ } public void testPaletteViewIsShowed() { - IViewPart paletteView = findView(PaletteViewPart.VIEW_ID); + IViewPart paletteView = findView(PaletteView.ID/*PaletteViewPart.VIEW_ID*/); assertNotNull("Palette View hasn't been loaded",paletteView); }

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18197 - branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-10-21 05:58:47 -0400 (Wed, 21 Oct 2009) New Revision: 18197 Modified: branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF Log: https://jira.jboss.org/jira/browse/JBIDE-5061 Modified: branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF =================================================================== --- branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2009-10-21 09:52:49 UTC (rev 18196) +++ branches/jbosstools-3.1.0.M4/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2009-10-21 09:58:47 UTC (rev 18197) @@ -11,6 +11,7 @@ org.jboss.tools.common.model.ui, org.jboss.tools.common.model.ui.test, org.jboss.tools.common.model.test, + org.eclipse.gef, org.jboss.tools.tests;bundle-version="2.0.0" Export-Package: org.jboss.tools.jst.web.ui.test Bundle-ClassPath: jst-web-ui.jar

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18196 - trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-10-21 05:52:49 -0400 (Wed, 21 Oct 2009) New Revision: 18196 Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF Log: Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2009-10-21 09:51:54 UTC (rev 18195) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2009-10-21 09:52:49 UTC (rev 18196) @@ -8,6 +8,7 @@ org.junit, org.eclipse.ui, org.eclipse.core.runtime, + org.eclipse.gef, org.jboss.tools.common.model.ui, org.jboss.tools.common.model.ui.test, org.jboss.tools.common.model.test,

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18195 - trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-10-21 05:51:54 -0400 (Wed, 21 Oct 2009) New Revision: 18195 Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebViewsTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-5061 Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebViewsTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebViewsTest.java 2009-10-21 09:42:06 UTC (rev 18194) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test/WebViewsTest.java 2009-10-21 09:51:54 UTC (rev 18195) @@ -12,6 +12,7 @@ import junit.framework.TestCase; +import org.eclipse.gef.ui.views.palette.PaletteView; import org.eclipse.ui.IPerspectiveDescriptor; import org.eclipse.ui.IPerspectiveRegistry; import org.eclipse.ui.IViewPart; @@ -65,7 +66,7 @@ } public void testPaletteViewIsShowed() { - IViewPart paletteView = findView(PaletteViewPart.VIEW_ID); + IViewPart paletteView = findView(PaletteView.ID/*PaletteViewPart.VIEW_ID*/); assertNotNull("Palette View hasn't been loaded",paletteView); }

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18194 - trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2009-10-21 05:42:06 -0400 (Wed, 21 Oct 2009) New Revision: 18194 Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java Log: ESB tests fixed Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java 2009-10-21 08:00:05 UTC (rev 18193) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java 2009-10-21 09:42:06 UTC (rev 18194) @@ -68,7 +68,7 @@ errorList); checkAttributeValue(object, "Providers/JBossMQ/quickstartGwChannel/Filter", - "dest name", + "destination name", "queue/quickstart_helloworld_file_notifier_Request_gw", errorList); checkAttributeValue(object, @@ -110,7 +110,7 @@ String ftpGatewayPath = "Services/myFileListener/Listeners/FtpGateway"; checkAttributeValue(object, ftpGatewayPath, - "bus id ref", + "channel id ref", "helloFTPChannel", errorList); checkAttributeValue(object, @@ -143,7 +143,7 @@ String hibListenerPath = "Services/myJmsListener/Listeners/HibernateGateway"; String[][] hibListeneAttrValues = { - {"bus id ref", "helloHibernateChannel"}, + {"channel id ref", "helloHibernateChannel"}, {"max threads", "1"}, {"is gateway", "true"} }; @@ -172,7 +172,7 @@ String jbrListenerPath = "Services/MyWssService/Listeners/Http-Gateway"; String[][] jbrListenerAttrValues = { - {"bus id ref", "Http-1"}, + {"channel id ref", "Http-1"}, {"max threads", "1"}, {"is gateway", "true"}, }; @@ -205,7 +205,7 @@ String fsListenerPath = "Services/myFileListener/Listeners/FileGateway"; String[][] fsListenerAttrValues = { - {"bus id ref", "helloFileChannel"}, + {"channel id ref", "helloFileChannel"}, {"max threads", "1"}, {"is gateway", "true"}, {"poll frequency seconds", "10"} @@ -241,7 +241,7 @@ String sqlListenerPath = "Services/myJmsListener/Listeners/SqlGateway"; String[][] sqlListenerAttrValues = { - {"bus id ref", "helloSQLChannel"}, + {"channel id ref", "helloSQLChannel"}, {"max threads", "1"}, {"is gateway", "true"} };

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18192 - trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2009-10-21 02:27:17 -0400 (Wed, 21 Oct 2009) New Revision: 18192 Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/build.properties Log: JBIDE-5038: apply the patch (With changes to BPEL project wizard, BPEL deployment is broken in UI) Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/build.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/build.properties 2009-10-21 06:12:43 UTC (rev 18191) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/build.properties 2009-10-21 06:27:17 UTC (rev 18192) @@ -1,6 +1,14 @@ + +# <copyright> +# </copyright> +# +# $Id: build.properties,v 1.2 2008/11/08 13:59:16 smoser Exp $ + +bin.includes = model/,\ + META-INF/,\ + plugin.xml,\ + .,\ + plugin.properties +jars.compile.order = . +output.. = bin/ source.. = src/ -output.. = bin/ -bin.includes = META-INF/,\ - model/,\ - .,\ - plugin.*

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18191 - workspace/examples.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2009-10-21 02:12:43 -0400 (Wed, 21 Oct 2009) New Revision: 18191 Modified: workspace/examples/project-examples-3.0.xml Log: add bpel examples Modified: workspace/examples/project-examples-3.0.xml =================================================================== --- workspace/examples/project-examples-3.0.xml 2009-10-21 00:50:17 UTC (rev 18190) +++ workspace/examples/project-examples-3.0.xml 2009-10-21 06:12:43 UTC (rev 18191) @@ -458,5 +458,27 @@ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/resteasy-examp... </url> </project> + + <project> + <category>BPEL</category> + <name>HelloWorld</name> + <shortDescription>A simple BPEL example</shortDescription> + <description>This sample is to show a simple BPEL2.0 example.</description> + <size>10000</size> + <url> + http://anonsvn.jboss.org/repos/jbosstools/workspace/grid/esb-example/Hell... + </url> + </project> + + <project> + <category>BPEL</category> + <name>Simple_Correlation</name> + <shortDescription>A correlation BPEL example</shortDescription> + <description>This sample is to show how to use the correlation in the BPEL2.0 example.</description> + <size>11000</size> + <url> + http://anonsvn.jboss.org/repos/jbosstools/workspace/grid/esb-example/Simp... + </url> + </project> </projects>

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18190 - in trunk/documentation/whatsnew: as and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2009-10-20 20:50:17 -0400 (Tue, 20 Oct 2009) New Revision: 18190 Added: trunk/documentation/whatsnew/as/as-news-3.1.0.M4.html trunk/documentation/whatsnew/core/core-news-3.1.0.M4.html trunk/documentation/whatsnew/esb/esb-news-1.1.0.M4.html trunk/documentation/whatsnew/examples/examples-news-1.1.0.M4.html trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M4.html trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M4.html Modified: trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M3.html trunk/documentation/whatsnew/index.html Log: What's new update for M4. File structure with components that has new_and_noteworthy labeled issues Added: trunk/documentation/whatsnew/as/as-news-3.1.0.M4.html =================================================================== --- trunk/documentation/whatsnew/as/as-news-3.1.0.M4.html (rev 0) +++ trunk/documentation/whatsnew/as/as-news-3.1.0.M4.html 2009-10-21 00:50:17 UTC (rev 18190) @@ -0,0 +1,95 @@ +<html> + +<head> +<link rel="stylesheet" href="../whatsnew.css"> +<title>JBoss AS Tools 2.1.0.M3 News</title> +</head> + +<body> + +<h1>JBoss AS Tools 3.1.0.M3 - New and Noteworthy</h1> + + <a href="../index.html">< Main Index</a> <a href="../hibernate/hibernate-news-3.3.0.M3.html">Hibernate Tools ></a> + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + + <tr> + <td colspan="2"> + <hr/> + <h3>Server</h3> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="left"> + + Configure filesets for Servers</td> + <td valign="top"> + There is now a preference page for configuring default filesets for server types. + + <img src="../images/default_fileset_for_servers.png"/> + + This can be used to setup which files inside the server configuration you wish to have easy access from the Server view, i.e. define **/*-log4j.xml for JBoss servers if you want to easily access the logging configuration files. + + <a href="https://jira.jboss.org/jira/browse/JBIDE-2534">Related jira</a> + </td> + </tr> + + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="left"> + + JBoss configuration Variable</td> + <td valign="top"> + You can now use <code>${jboss_config}</code> to refer to the selected JBoss Configuration to allow for portable filesets. + <img src="../images/config_variable_in_filefilter.png"/> + + Since this variable is an Eclipse Variable it can even be + used in launch configurations and similar places. Here a + specific server/runtime needs to be named, + i.e. <code>${jboss_config:JMyBoss4}</code>. + + <a href="https://jira.jboss.org/jira/browse/JBIDE-4680">Related jira</a> + </td> + </tr> + + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="left"> + + Updated icons/images to new JBoss logo</td> + <td valign="top"> + The new wizards for Server types now uses the new JBoss logo + + <img src="../images/jbosslogo_server.png"/> + + <a href="https://jira.jboss.org/jira/browse/JBIDE-4709">Related jira</a> + </td> + </tr> + + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + + + +</table> + +</body> + +</html> + + Property changes on: trunk/documentation/whatsnew/as/as-news-3.1.0.M4.html ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Added: trunk/documentation/whatsnew/core/core-news-3.1.0.M4.html =================================================================== --- trunk/documentation/whatsnew/core/core-news-3.1.0.M4.html (rev 0) +++ trunk/documentation/whatsnew/core/core-news-3.1.0.M4.html 2009-10-21 00:50:17 UTC (rev 18190) @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css" /> +<title>What's New</title> +</head> +<body> +<h1>What's New Core/General</h1> + +<a href="../index.html">< Main Index</a> <a + href="../jst/jst-news-3.1.0.M4.html">JST Tools ></a> +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"> + <hr /> + <h3>Project Archives</h3> + <hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"><a name="itemname3" id="itemname3"></a>Nested archives now supports incremental updates</td> + <td valign="top"> + Previously nested project archives were possible to define, but updates in a nested archive were not always happening. + + This is now fixed allowing you to have structures like the following: + + + <verbatim> + x.jar + ear/x.ear + ear/x.ear/x.jar + </verbatim> + And when updating x.jar in the top-level the ear project's version of x.jar will now also be updated. + + <a + href="https://jira.jboss.org/jira/browse/JBIDE-4249">Related Jira</a> + + </td> + </tr> + + <tr> + <td colspan="2"><hr /> + </td> + </tr> + + <tr> + <td valign="top" align="left"><a name="itemname3" id="itemname3"></a>Build Project Archive Action</td> + <td valign="top"> + There is now a "Build Project Archive" action which users can configure a hotkey for if they wish. + When invoked the project for the currently selected resource will be built. + <img src="../images/build_project_archives_action.png"/> + + <a + href="https://jira.jboss.org/jira/browse/JBIDE-2452">Related Jira</a> + + </td> + </tr> + + <tr> + <td colspan="2"> + <hr /> + <h3>Properties editor</h3> + <hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"><a name="itemname3" id="itemname3"></a>Filter/Search Regular Expression</td> + <td valign="top"> + The JBoss Tools properties editor's filter field now supports regular expressions. + + <img src="../images/properties_regular_expression.png"/> + + By default the Name and Value fields are just substring seach, but if you enable "Expressions" you can use regular expressions. + + <a + href="https://jira.jboss.org/jira/browse/JBIDE-4576">Related Jira</a> + </td> + </tr> + +</table> + +</body> + +</html> + + Property changes on: trunk/documentation/whatsnew/core/core-news-3.1.0.M4.html ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Added: trunk/documentation/whatsnew/esb/esb-news-1.1.0.M4.html =================================================================== --- trunk/documentation/whatsnew/esb/esb-news-1.1.0.M4.html (rev 0) +++ trunk/documentation/whatsnew/esb/esb-news-1.1.0.M4.html 2009-10-21 00:50:17 UTC (rev 18190) @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>ESB tools 1.1.0.CR2 What's New</title> +</head> +<body> +<h1>ESB tools 1.1.0.CR2 What's New</h1> + +<a href="../index.html">< Main Index</a> <a href="../smooks/smooks-news-1.1.0.M4.html">Smooks Tools ></a> + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + + <tr> + <td colspan="2"> + <hr/> + <h3>Editors</h3> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a>Smooks Action</td> + <td valign="top"> + The the wizard of creating the out of the box action SmooksTransformer is now deprecated, and replaced by new Smooks Action wizard. + + <a href="https://jira.jboss.org/jira/browse/JBIDE-4187">Related Jira</a> + </td> + </tr> + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a>ESB 4.5 support in ESB Tools</td> + <td valign="top"> + ESB 4.5 supports two jboss-esb.xsd versions for jboss-esb.xml configuration file , ESB project creation wizard allows you to choose the version for configuration file, and the jboss-esb.xml editor supports the new versoin as well. + + <a href="https://jira.jboss.org/jira/browse/JBIDE-3847">Related Jira</a> + </td> + </tr> + + + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a>Open On feature for jboss-esb.xml files</td> + <td valign="top"> + This feature allows you to open different types of file/pages inside <action> using OpenOn. + + <a href="https://jira.jboss.org/jira/browse/JBIDE-3665">Related Jira</a> + </td> + </tr> + +</table> + +</body> + +</html> + + Property changes on: trunk/documentation/whatsnew/esb/esb-news-1.1.0.M4.html ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Added: trunk/documentation/whatsnew/examples/examples-news-1.1.0.M4.html =================================================================== --- trunk/documentation/whatsnew/examples/examples-news-1.1.0.M4.html (rev 0) +++ trunk/documentation/whatsnew/examples/examples-news-1.1.0.M4.html 2009-10-21 00:50:17 UTC (rev 18190) @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>Examples 1.1.0.M1 What's New</title> +</head> +<body> +<h1>Examples 1.1.0.M1 What's New</h1> + +<a href="../index.html">< Main Index</a> <a href="../esb/esb-news-1.1.0.M4.html">ESB Tools ></a> + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"> + <hr/> + <h3>General</h3> + <hr/> + </td> + </tr> + <td valign="top" align="right"> + <a name="itemnam2e" id="itemname2"></a>User provided project examples + </td> + <td width="70%" valign="top"> + You can now add your own project examples url to JBoss Tools without providing a plugin. Allowing you to use 3rd party project examples or simply just try out creating your own. + +<img src="../images/customprojectexamples.png"/> + + <a href="https://jira.jboss.org/jira/browse/JBIDE-4292">Related jira</a> + </td> + </tr> + + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + <td valign="top" align="right"> + <a name="itemnam2e" id="itemname2"></a>Seam Examples with Cheatsheets + </td> + <td width="70%" valign="top"> + We have added a few of the Seam exmples to the project example site and we also added Cheatsheets to some of these +based on the Seam Example tutorials allowing you to see the explanation of the code and navigate to it directly in the IDE. + + <a href="https://jira.jboss.org/jira/browse/JBIDE-4180">Related jira</a> + </td> + </tr> + +</table> + +</body> + +</html> + + Property changes on: trunk/documentation/whatsnew/examples/examples-news-1.1.0.M4.html ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Modified: trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M3.html =================================================================== --- trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M3.html 2009-10-20 23:00:15 UTC (rev 18189) +++ trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M3.html 2009-10-21 00:50:17 UTC (rev 18190) @@ -11,7 +11,7 @@ <body> <h1>Hibernate tools 3.3.0.M3 What's New</h1> -<a href="../index.html">< Main Index</a> <a href="../maven/maven-news-1.0.0.M3.html">Maven Tools ></a> +<a href="../index.html">< Main Index</a> <a href="../examples/examples-news-1.1.0.M4.html">Project Examples ></a> <table border="0" cellpadding="10" cellspacing="0" width="80%"> Added: trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M4.html =================================================================== --- trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M4.html (rev 0) +++ trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M4.html 2009-10-21 00:50:17 UTC (rev 18190) @@ -0,0 +1,157 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>Hibernate tools 3.3.0.M3 What's New</title> +</head> +<body> +<h1>Hibernate tools 3.3.0.M3 What's New</h1> + +<a href="../index.html">< Main Index</a> <a href="../maven/maven-news-1.0.0.M3.html">Maven Tools ></a> + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + + <tr> + <td colspan="2"> + <hr/> + <h3>Dali Integration</h3> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a>Validation via NamingStrategy</td> + <td valign="top"> + When using Hibernate Platform with Dali (JPA Tooling) we now validate through the chosen NamingStrategy (if none chosen the default NamingStrategy is used). + + This allows those users who have custom naming strategies in place to utilize the nice Dali JPA validation of wether the reference table and column names are enabled. + + Note: Remember for Dali validation to work you have to enable the JPA facet on your project and have the chosen DTP connection be connected to the database. If not, Dali will not perform any validation! + + In case you do not want the NamingStrategy to be used, i.e. your NamingStrategy requires custom setup or have dependencies not available during design time you can disable the use of it on the Hibernate project preference page. + + + + Releated jiras: <a href="http://jira.jboss.org/jira/browse/JBIDE-4761">1</a>, <a href="http://jira.jboss.org/jira/browse/JBIDE-4803">2</a> + + </td> + </tr> + + + + + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a>Hibernate specific annotations</td> + <td valign="top"> + The JPA UI and validation has been extended to cover a few more Hibernate specific annotations. + + <ul> + <li><code>@GenericGenerators</code> (before only supported the singular <code>@GenericGenerator</code></li> + <li><code>@DiscriminatorFormula</code></li> + <li><code>@NamedQuery</code></li> + <li><code>@NamedNativeQuery</code></li> + <li><code>@Embeddable</code> with associations (not allowed in JPA spec, but ok in Hibernate)</li> +</ul> + + This means that these annotations now have UI support and if possible also validated in Dali. + + This screenshot shows a @NamedQuery being edited/shown in the UI. + + <img src="../images/hibernatenamedquerydaliui.png"/> + + + + + Releated jiras: <a href="http://jira.jboss.org/jira/browse/JBIDE-4521">1</a>, <a href="http://jira.jboss.org/jira/browse/JBIDE-4649">2</a>,<a href="http://jira.jboss.org/jira/browse/JBIDE-4613">3</a>, <a href="http://jira.jboss.org/jira/browse/JBIDE-4527">4</a>, <a href="http://jira.jboss.org/jira/browse/JBIDE-4716">5</a> + + + </td> + </tr> + + <tr> + <td colspan="2"> + <hr/> + <h3>Wizards</h3> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a>hbm.xml Wizard now generates mapping for object graph</td> + <td valign="top"> + When using New Hibernate Mapping wizard the generated hbm.xml now contains basic mappings for properties and associations. + +<img src="../images/new_hbm_xml_selection.png"/> + +You can select a package or multiple individual classes and then from there the wizard will traverse the object graph and generate mappings for the full object graph. + <a href="http://jira.jboss.org/jira/browse/JBIDE-3457">Related jira</a> + + </td> + </tr> + + <tr> + <td colspan="2"> + <hr/> + <h3>Views</h3> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a>Pending... node</td> + <td valign="top"> + Creation/opening of a Console Configuration is now visualized with a Pending... node until it completes. + +<img src="../images/hc_pending_icon.png"/> + + <a href="http://jira.jboss.org/jira/browse/JBIDE-4622">Related jira</a> + + </td> + </tr> + + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a>Mapping Diagram</td> + <td valign="top"> + The mapping diagram now has support for showing Grid, Rules and Snap-to-Geometry. + + <img src="../images/hibernate_rulers_grid_snap2geometry.jpg"/> + + <a href="http://jira.jboss.org/jira/browse/JBIDE-4643">Related jira</a> + + </td> + </tr> + + + + + + <tr> + <td colspan="2"> + <hr/> + </td> + </tr> + + +</table> + +</body> + +</html> + + Property changes on: trunk/documentation/whatsnew/hibernate/hibernate-news-3.3.0.M4.html ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Modified: trunk/documentation/whatsnew/index.html =================================================================== --- trunk/documentation/whatsnew/index.html 2009-10-20 23:00:15 UTC (rev 18189) +++ trunk/documentation/whatsnew/index.html 2009-10-21 00:50:17 UTC (rev 18190) @@ -24,6 +24,21 @@ <tr> <td valign="top" align="left"> + 3.1.0.M4 + <td valign="top"> + <a href="core/core-news-3.1.0.M4.html">Core/General</a> + <a href="jst/jst-news-3.1.0.M4.html">JST/JSF Tools</a> + <a href="as/as-news-3.1.0.M4.html">JBoss AS Tools</a> + <a href="hibernate/hibernate-news-3.3.0.M4.html">Hibernate Tools</a> + <a href="examples/examples-news-1.1.0.M4.html">Project Examples</a> + <a href="vpe/vpe-news-3.1.0.M4.html">Visual Page Editor</a> + <a href="seam/seam-news-3.1.0.M4.html">Seam Tools</a> + <a href="smooks/smooks-news-1.1.0.M4.html">Smooks Tools</a> + </td> + </tr> + + <tr> + <td valign="top" align="left"> 3.1.0.M3 <td valign="top"> <a href="core/core-news-3.1.0.M3.html">Core/General</a> Added: trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html =================================================================== --- trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html (rev 0) +++ trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html 2009-10-21 00:50:17 UTC (rev 18190) @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css"/> +<title>JST/JSF 3.1.0.M3 What's New</title> +</head> +<body> +<h1>JST/JSF 3.1.0.M3 What's New</h1> + +<a href="../core/core-news-3.1.0.M4.html">< Main Index</a> <a href="../as/as-news-3.1.0.M4.html">Server Tools ></a> + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + <tr> + <td colspan="2"> + <hr/> + <h3>OpenOn</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="left"> + EL Variables</td> + <td valign="top">OpenOn's are now available for source elements. + + <a href="https://jira.jboss.org/jira/browse/JBIDE-2806">Related Jira</a> + </td> + </tr> + + <tr> + <td colspan="2"> + <hr/> + <h3>Code assist</h3> + <hr/> + </td> + </tr> + <tr> + <td valign="top" align="left"> + Unified EL completion for Seam and JSF projects</td> + <td valign="top">EL completion for Seam and JSF projects are now unified (uses same codebase). + +In previous releases there were small differences between how code completion were done for projects with or without Seam configured, i.e. code completion for Seam variables were not available in Wizards and property sheets and some of the features of JBoss EL were not honored in JSF projects. + + Related jiras: <a href="https://jira.jboss.org/jira/browse/JBIDE-2920">1</a>, <a href="https://jira.jboss.org/jira/browse/JBIDE-1826">2</a> + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + + <tr> + <td valign="top" align="left"> + EL completion in style attributes</td> + <td valign="top">Code assist for EL variables are now available in style attributes of XHTML files. + + <a href="https://jira.jboss.org/jira/browse/JBIDE-3750">Related Jira</a> + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + + <tr> + <td valign="top" align="left"> + Information hover for JSF tags</td> + <td valign="top">When code completing JSF/Facelets tags we now show a information box with the related tag documentation. Descriptions are fetched from TLD and facelet information. + + <img src="../images/tagdocs.png"/> + + <a href="https://jira.jboss.org/jira/browse/JBIDE-534">Related Jira</a> + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + <tr> + <td valign="top" align="left"> + Code assist for attributes expecting an ID in richfaces</td> + <td valign="top">Code assist now provides id completion for attributes that is known to work with ID's (for, focus, reRender, etc.). Both single and multi-valued (comma separated) completion are supported. + + <img src="../images/forid_like_codeassist.png"/> + + + <a href="https://jira.jboss.org/jira/browse/JBIDE-3571">Related Jira</a> + </td> + </tr> + <tr> + <td colspan="2"><hr /> + </td> + </tr> + + +</table> + +</body> + +</html> Property changes on: trunk/documentation/whatsnew/jst/jst-news-3.1.0.M4.html ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Added: trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M4.html =================================================================== --- trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M4.html (rev 0) +++ trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M4.html 2009-10-21 00:50:17 UTC (rev 18190) @@ -0,0 +1,135 @@ +<?xml version="1.0" encoding="iso-8859-1"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Language" content="en-us" /> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<link rel="stylesheet" href="../whatsnew.css" /> +<title>Smooks tools 1.1.0.M3 What's New</title> +</head> +<body> +<h1>Smooks tools 1.1.0.M3 What's New</h1> + +<a href="../index.html">< Main Index</a> <a + href="../core/core-news-3.1.0.M4.html">Core/General ></a> + + +<table border="0" cellpadding="10" cellspacing="0" width="80%"> + + <tr> + <td colspan="2"> + <hr /> + <h3>Smooks Configuration Editor</h3> + <hr /> + </td> + </tr> + <tr> + <td valign="top" align="right"><a name="itemname1" id="itemname1"></a>Multiple Page Editor</td> + <td valign="top"> + Overview page. Configurate the high level informations of + Smooks configuration file. + + <img src="../images/smookstools_overview_page.png" + style="width: 991px; height: 472px" /> + + Reader Page. Add/Remove the Reader model in this page. + + <img src="../images/smookstools_reader_page.png" /> + + Message Filter Page. This page inherits many functions from the + Design page , it can add/remove the message filter resources. + + <img src="../images/smookstools_message_filter_page.png" /> + </td> + </tr> + <tr> + <td colspan="2"> + <hr /> + </td> + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname2" id="itemname2"></a>Support + the Smooks configuration file 1.2.1 version</td> + <td valign="top"> + The Smooks editor support the Smooks configuration file which + is related to Smooks 1.2.1 platform. + + <img src="../images/smookstools_addchildren_wizardpage.png" /> + + <img src="../images/smookstools_addreader_wizardpage.png" /> + + </td> + </tr> + + <tr> + <td colspan="2"> + <hr /> + </td> + + + </tr> + + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a>Support + CSV,JSON,EDI input type data</td> + <td valign="top"> + Support CSV , JSON , EDI input type data + + <img src="../images/smookstools_inputdataselection_v12.png" /> + + CSV input Reader configuration wizard page. + + <img src="../images/smookstools_csvdatawizard3.png" /> + + EDI input Reader configuration wizard page. + + <img src="../images/smookstools_edi_wizard_v12.png" /> + + JSON input Reader configuration wizard page. + + <img src="../images/smookstools_jsondatawizard3.png" /> + + </td> + </tr> + + <tr> + <td colspan="2"> + <hr /> + <h3>EDI Message Mapping Graphical Editor</h3> + <hr /> + </td> + </tr> + <tr> + <td valign="top" align="right"><a name="itemname3" id="itemname3"></a>EDI + Message Mapping Graphical Editor</td> + <td valign="top"> + EDI Message Mapping File Wizard. + + <img + src="../images/smookstools_edi_message_mapping_file_wizard.png" /> + + <img src="../images/smookstools_edi_config_wizardpage.png" /> + + EDI Message Mapping Graphical Editor. It can edit the + EDI-Message-Mapping configuration file. + + <img src="../images/smookstools_edi_message_mapping_editor.png" /> + + </td> + </tr> + + <tr> + <td colspan="2"> + <hr /> + </td> + </tr> + +</table> + +</body> + +</html> + + Property changes on: trunk/documentation/whatsnew/smooks/smooks-news-1.1.0.M4.html ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain

14 years, 8 months

1
0
0 / 0

JBoss Tools SVN: r18189 - branches/jbosstools-3.1.0.M4/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2009-10-20 19:00:15 -0400 (Tue, 20 Oct 2009) New Revision: 18189 Modified: branches/jbosstools-3.1.0.M4/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XModelObjectTreeViewComponent.java Log: The exceptions in JUnit tests were fixed: Caused by: java.lang.NullPointerException [java] at org.jboss.tools.common.editor.XModelObjectTreeViewComponent$4.run(XModelObjectTreeViewComponent.java:134) [java] at org.eclipse.swt.widgets.RunnableLock.run(RunnableLock.java:35) [java] at org.eclipse.swt.widgets.Synchronizer.runAsyncMessages(Synchronizer.java:134) [java] ... 28 more Modified: branches/jbosstools-3.1.0.M4/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XModelObjectTreeViewComponent.java =================================================================== --- branches/jbosstools-3.1.0.M4/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XModelObjectTreeViewComponent.java 2009-10-20 22:58:21 UTC (rev 18188) +++ branches/jbosstools-3.1.0.M4/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/editor/XModelObjectTreeViewComponent.java 2009-10-20 23:00:15 UTC (rev 18189) @@ -128,13 +128,13 @@ final TreeViewer treeViewer = getViewer(); Menu menu = menuMgr.createContextMenu(treeViewer.getTree()); treeViewer.getTree().setMenu(menu); - Display.getDefault().asyncExec(new Runnable() { - public void run() { - ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow() - .getActivePage().getActiveEditor().getSite() - .registerContextMenu(menuMgr, treeViewer); - } - }); +// Display.getDefault().asyncExec(new Runnable() { +// public void run() { +// ModelUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow() +// .getActivePage().getActiveEditor().getSite() +// .registerContextMenu(menuMgr, treeViewer); +// } +// }); } protected void fillContextMenu(IMenuManager menu) {

14 years, 8 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits October 2009