March 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r29871 - trunk/bpel/docs/reference/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-03-17 17:01:05 -0400 (Thu, 17 Mar 2011) New Revision: 29871 Modified: trunk/bpel/docs/reference/en-US/master.xml Log: removed PDF link from within the book --his line, and those below, will be ignored-- M en-US/master.xml Modified: trunk/bpel/docs/reference/en-US/master.xml =================================================================== --- trunk/bpel/docs/reference/en-US/master.xml 2011-03-17 20:59:52 UTC (rev 29870) +++ trunk/bpel/docs/reference/en-US/master.xml 2011-03-17 21:01:05 UTC (rev 29871) @@ -43,12 +43,12 @@ <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> Version: 1.0.0.trunk </releaseinfo> - <abstract> +  </bookinfo> <toc/> &overview;&install;&tasks;&reference;&summary;

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29870 - trunk/birt/docs/en-US.

by jbosstools-commits＠lists.jboss.org

Author: irooskov(a)redhat.com Date: 2011-03-17 16:59:52 -0400 (Thu, 17 Mar 2011) New Revision: 29870 Modified: trunk/birt/docs/en-US/master.xml Log: removed PDF link from within the book Modified: trunk/birt/docs/en-US/master.xml =================================================================== --- trunk/birt/docs/en-US/master.xml 2011-03-17 17:50:35 UTC (rev 29869) +++ trunk/birt/docs/en-US/master.xml 2011-03-17 20:59:52 UTC (rev 29870) @@ -65,12 +65,12 @@ </releaseinfo> -<abstract> + </bookinfo>

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29869 - branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-03-17 13:50:35 -0400 (Thu, 17 Mar 2011) New Revision: 29869 Added: branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/ResourceAdapterTest.java Modified: branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/CommonModelAllTests.java Log: JBIDE-8602 https://issues.jboss.org/browse/JBIDE-8602 Modified: branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/CommonModelAllTests.java =================================================================== --- branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/CommonModelAllTests.java 2011-03-17 17:48:25 UTC (rev 29868) +++ branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/CommonModelAllTests.java 2011-03-17 17:50:35 UTC (rev 29869) @@ -34,6 +34,7 @@ suite.addTestSuite(PropertiesLoaderTest.class); suite.addTestSuite(JarAccessTest.class); suite.addTestSuite(EclipseJavaUtilTest.class); + suite.addTestSuite(ResourceAdapterTest.class); return suite; } } Added: branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/ResourceAdapterTest.java =================================================================== --- branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/ResourceAdapterTest.java (rev 0) +++ branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/ResourceAdapterTest.java 2011-03-17 17:50:35 UTC (rev 29869) @@ -0,0 +1,61 @@ +package org.jboss.tools.common.model.test; + +import java.io.IOException; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.ui.ide.ResourceUtil; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.TestProjectProvider; + +/** + * + * @author V.Kabanovich + * + */ +public class ResourceAdapterTest extends TestCase { + static String BUNDLE_NAME = "org.jboss.tools.common.model.test"; + TestProjectProvider provider = null; + IProject project = null; + + public ResourceAdapterTest() {} + + public void setUp() throws Exception { + provider = new TestProjectProvider(BUNDLE_NAME, null, "Test1", true); + project = provider.getProject(); + + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + + JobUtils.waitForIdle(); + } + + public void testResourceAdapter() throws CoreException, IOException { + IFile f = project.getFile(new Path("src/x.properties")); + assertNotNull(f); + XModelObject p = EclipseResourceUtil.createObjectForResource(f); + assertNotNull(p); + XModelObject a = p.getChildByPath("a"); + + // XModelObject should not directly adapt to IResource - + IResource r = (IResource)a.getAdapter(IResource.class); + assertNull(r); + + // There is adapter factory to adapt XModelObject to IResource + r = (IResource)ResourceUtil.getAdapter(a, IResource.class, true); + assertEquals(f, r); + + // At present, direct adapting to IFile rises no problem. + IFile fa = (IFile)a.getAdapter(IFile.class); + assertEquals(f, fa); + + } + +} Property changes on: branches/jbosstools-3.2.x/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/ResourceAdapterTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29868 - trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-03-17 13:48:25 -0400 (Thu, 17 Mar 2011) New Revision: 29868 Added: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/ResourceAdapterTest.java Modified: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/CommonModelAllTests.java Log: JBIDE-8602 https://issues.jboss.org/browse/JBIDE-8602 Modified: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/CommonModelAllTests.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/CommonModelAllTests.java 2011-03-17 17:25:23 UTC (rev 29867) +++ trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/CommonModelAllTests.java 2011-03-17 17:48:25 UTC (rev 29868) @@ -34,6 +34,7 @@ suite.addTestSuite(PropertiesLoaderTest.class); suite.addTestSuite(JarAccessTest.class); suite.addTestSuite(EclipseJavaUtilTest.class); + suite.addTestSuite(ResourceAdapterTest.class); return suite; } } Added: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/ResourceAdapterTest.java =================================================================== --- trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/ResourceAdapterTest.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/ResourceAdapterTest.java 2011-03-17 17:48:25 UTC (rev 29868) @@ -0,0 +1,61 @@ +package org.jboss.tools.common.model.test; + +import java.io.IOException; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.ui.ide.ResourceUtil; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.TestProjectProvider; + +/** + * + * @author V.Kabanovich + * + */ +public class ResourceAdapterTest extends TestCase { + static String BUNDLE_NAME = "org.jboss.tools.common.model.test"; + TestProjectProvider provider = null; + IProject project = null; + + public ResourceAdapterTest() {} + + public void setUp() throws Exception { + provider = new TestProjectProvider(BUNDLE_NAME, null, "Test1", true); + project = provider.getProject(); + + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + + JobUtils.waitForIdle(); + } + + public void testResourceAdapter() throws CoreException, IOException { + IFile f = project.getFile(new Path("src/x.properties")); + assertNotNull(f); + XModelObject p = EclipseResourceUtil.createObjectForResource(f); + assertNotNull(p); + XModelObject a = p.getChildByPath("a"); + + // XModelObject should not directly adapt to IResource - + IResource r = (IResource)a.getAdapter(IResource.class); + assertNull(r); + + // There is adapter factory to adapt XModelObject to IResource + r = (IResource)ResourceUtil.getAdapter(a, IResource.class, true); + assertEquals(f, r); + + // At present, direct adapting to IFile rises no problem. + IFile fa = (IFile)a.getAdapter(IFile.class); + assertEquals(f, fa); + + } + +} Property changes on: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools/common/model/test/ResourceAdapterTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29867 - in branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model: src/org/jboss/tools/common/model/impl and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-03-17 13:25:23 -0400 (Thu, 17 Mar 2011) New Revision: 29867 Added: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectToResourceAdapter.java Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/plugin.xml branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java Log: JBIDE-8602 https://issues.jboss.org/browse/JBIDE-8602 Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/plugin.xml =================================================================== --- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/plugin.xml 2011-03-17 17:21:03 UTC (rev 29866) +++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/plugin.xml 2011-03-17 17:25:23 UTC (rev 29867) @@ -397,4 +397,13 @@ resource="meta/options_general.xml" priority="0"> </contribution> </extension> + + <extension point="org.eclipse.core.runtime.adapters"> + <factory + class="org.jboss.tools.common.model.impl.XModelObjectToResourceAdapter" + adaptableType="org.jboss.tools.common.model.XModelObject"> + <adapter type="org.eclipse.core.resources.IResource"/> + </factory> + </extension> + </plugin> Modified: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java =================================================================== --- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2011-03-17 17:21:03 UTC (rev 29866) +++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2011-03-17 17:25:23 UTC (rev 29867) @@ -480,9 +480,8 @@ public Object getAdapter(Class adapter) { if(XModelObject.class == adapter) return this; else if(adapter == IResource.class) { - XModelObject f = getResourceAncestor(); - Object o = (f == null || f == this) ? null : f.getAdapter(IResource.class); - return (o instanceof IResource) ? o : null; + //implementation moved to XModelObjectToResourceAdapter + return null; } else if(adapter == IProject.class) { return EclipseResourceUtil.getProject(this); } else if(adapter == IFile.class) { Added: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectToResourceAdapter.java =================================================================== --- branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectToResourceAdapter.java (rev 0) +++ branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectToResourceAdapter.java 2011-03-17 17:25:23 UTC (rev 29867) @@ -0,0 +1,34 @@ +/******************************************************************************* + * Copyright (c) 2011 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.common.model.impl; + +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IAdapterFactory; +import org.jboss.tools.common.model.XModelObject; + +public class XModelObjectToResourceAdapter implements IAdapterFactory { + + public Object getAdapter(Object adaptableObject, Class adapterType) { + if(adaptableObject instanceof XModelObject && adapterType == IResource.class) { + XModelObject o = (XModelObject)adaptableObject; + XModelObject f = ((XModelObjectImpl)o).getResourceAncestor(); + Object r = (f == null || f == this) ? null : f.getAdapter(IResource.class); + return (r instanceof IResource) ? r : null; + } + return null; + } + + public Class[] getAdapterList() { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: branches/jbosstools-3.2.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectToResourceAdapter.java ___________________________________________________________________ Added: svn:mime-type + text/plain

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29866 - in trunk/common/plugins/org.jboss.tools.common.model: src/org/jboss/tools/common/model/impl and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-03-17 13:21:03 -0400 (Thu, 17 Mar 2011) New Revision: 29866 Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectToResourceAdapter.java Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java Log: JBIDE-8602 https://issues.jboss.org/browse/JBIDE-8602 Modified: trunk/common/plugins/org.jboss.tools.common.model/plugin.xml =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2011-03-17 15:17:02 UTC (rev 29865) +++ trunk/common/plugins/org.jboss.tools.common.model/plugin.xml 2011-03-17 17:21:03 UTC (rev 29866) @@ -397,4 +397,13 @@ resource="meta/options_general.xml" priority="0"> </contribution> </extension> + + <extension point="org.eclipse.core.runtime.adapters"> + <factory + class="org.jboss.tools.common.model.impl.XModelObjectToResourceAdapter" + adaptableType="org.jboss.tools.common.model.XModelObject"> + <adapter type="org.eclipse.core.resources.IResource"/> + </factory> + </extension> + </plugin> Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2011-03-17 15:17:02 UTC (rev 29865) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2011-03-17 17:21:03 UTC (rev 29866) @@ -480,9 +480,8 @@ public Object getAdapter(Class adapter) { if(XModelObject.class == adapter) return this; else if(adapter == IResource.class) { - XModelObject f = getResourceAncestor(); - Object o = (f == null || f == this) ? null : f.getAdapter(IResource.class); - return (o instanceof IResource) ? o : null; + //implementation moved to XModelObjectToResourceAdapter + return null; } else if(adapter == IProject.class) { return EclipseResourceUtil.getProject(this); } else if(adapter == IFile.class) { Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectToResourceAdapter.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectToResourceAdapter.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectToResourceAdapter.java 2011-03-17 17:21:03 UTC (rev 29866) @@ -0,0 +1,34 @@ +/******************************************************************************* + * Copyright (c) 2011 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.common.model.impl; + +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.IAdapterFactory; +import org.jboss.tools.common.model.XModelObject; + +public class XModelObjectToResourceAdapter implements IAdapterFactory { + + public Object getAdapter(Object adaptableObject, Class adapterType) { + if(adaptableObject instanceof XModelObject && adapterType == IResource.class) { + XModelObject o = (XModelObject)adaptableObject; + XModelObject f = ((XModelObjectImpl)o).getResourceAncestor(); + Object r = (f == null || f == this) ? null : f.getAdapter(IResource.class); + return (r instanceof IResource) ? r : null; + } + return null; + } + + public Class[] getAdapterList() { + // TODO Auto-generated method stub + return null; + } + +} Property changes on: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/impl/XModelObjectToResourceAdapter.java ___________________________________________________________________ Added: svn:mime-type + text/plain

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29865 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties.

by jbosstools-commits＠lists.jboss.org

Author: bbrodt Date: 2011-03-17 11:17:02 -0400 (Thu, 17 Mar 2011) New Revision: 29865 Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java Log: https://issues.jboss.org/browse/JBIDE-8045 browseForVariableType() returns an Object[] instead of Object Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java 2011-03-17 15:02:25 UTC (rev 29864) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSection.java 2011-03-17 15:17:02 UTC (rev 29865) @@ -189,7 +189,7 @@ // https://issues.jboss.org/browse/JBIDE-8045 variableTypeSelector = new VariableTypeSelector(composite, SWT.NONE, getBPELEditor(), - fWidgetFactory, new VariableTypeCallback(), true, + fWidgetFactory, new VariableTypeCallback(), false, TypeSelectorDialog.INCLUDE_ALL); FlatFormData data = new FlatFormData(); data.top = new FlatFormAttachment(0,0); Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java 2011-03-17 15:02:25 UTC (rev 29864) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/properties/VariableTypeSelector.java 2011-03-17 15:17:02 UTC (rev 29865) @@ -677,9 +677,10 @@ public void widgetSelected(SelectionEvent e) { // https://issues.jboss.org/browse/JBIDE-8045 - Object xsdType = BrowseUtil.browseForVariableType( + Object selection[] = BrowseUtil.browseForVariableType( bpelEditor.getProcess(), getShell(),requireLowerTreeSelection,filter); - if (xsdType != null) { + if (selection != null) { + Object xsdType = selection[0]; lastChangeContext = DATATYPE_BROWSE_CONTEXT; if (xsdType instanceof XSDTypeDefinition) { // TODO:WDG: if type is anonymous, use enclosing element

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29864 - in trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui: util and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: bbrodt Date: 2011-03-17 11:02:25 -0400 (Thu, 17 Mar 2011) New Revision: 29864 Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java Log: https://issues.jboss.org/browse/JBIDE-8601 Display error dialog instead of ignoring hyperlink clicks Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java 2011-03-17 12:58:55 UTC (rev 29863) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Messages.java 2011-03-17 15:02:25 UTC (rev 29864) @@ -241,6 +241,12 @@ public static String BPELUtil__unknown_URI__54; public static String BPELUtil_HiddenSequence_2; public static String BPELUtil_Sequence_1; + + // https://issues.jboss.org/browse/JBIDE-8601 + public static String BPELUtil__Error; + public static String BPELUtil_NoEditorForNullObject; + public static String BPELUtil_NoEditorForObject; + public static String BPELVariableAdapter_Variable_1; public static String BPELXYLayoutEditPolicy_Add_Part_1; public static String BPELXYLayoutEditPolicy_Move_Part_2; Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties 2011-03-17 12:58:55 UTC (rev 29863) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/messages.properties 2011-03-17 15:02:25 UTC (rev 29864) @@ -132,10 +132,14 @@ BPELPreferencePage_WSIL_Description = The document above contains links to other WSIL documents shown below.\nYou can add or remove WSIL links to/from the above document.\nThe result will be shown in the WSIL browser of the editor. # BPELUIRegistry_Expression_language_editors_must_provide_expressionLanguage_and_class__8=Expression language editors must provide expressionLanguage and class. +BPELUtil__Error=Error BPELUtil__unknown_URI__54=<unknown URI> BPELUtil_HiddenSequence_2=HiddenSequence BPELUtil_Sequence_1=Sequence BPELUtil_NCName=Not a valid NCName +BPELUtil_NoEditorForNullObject=Cannot open editor for null object +BPELUtil_NoEditorForObject=Cannot open editor for object of type {0} + BPELVariableAdapter_Variable_1=Variable BPELXYLayoutEditPolicy_Add_Part_1=Add Part BPELXYLayoutEditPolicy_Move_Part_2=Move Part Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java 2011-03-17 12:58:55 UTC (rev 29863) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/BPELUtil.java 2011-03-17 15:02:25 UTC (rev 29864) @@ -118,10 +118,12 @@ import org.eclipse.gef.GraphicalViewer; import org.eclipse.gef.Tool; import org.eclipse.jface.dialogs.IInputValidator; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.window.Window; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.accessibility.ACC; import org.eclipse.swt.accessibility.AccessibleControlEvent; @@ -1724,14 +1726,34 @@ public static void openEditor(EObject modelObject, BPELEditor editor) { try { // https://issues.jboss.org/browse/JBIDE-8044 - Assert.isNotNull(modelObject); - Assert.isNotNull(modelObject.eResource()); - // https://jira.jboss.org/browse/JBIDE-7351 - // try to resolve proxies here, otherwise we don't know editor input - if (modelObject.eIsProxy()) { - modelObject = EmfModelQuery.resolveProxy(editor.getProcess(), modelObject); + if (modelObject==null) { + // https://issues.jboss.org/browse/JBIDE-8601 + MessageDialog.openError(editor.getEditorSite().getShell(), + Messages.BPELUtil__Error, + Messages.BPELUtil_NoEditorForNullObject); + return; } - IFile file = BPELUtil.getFileFromURI(modelObject.eResource().getURI()); + + EObject resolvedObject = null; + if (modelObject.eResource()==null) { + // https://jira.jboss.org/browse/JBIDE-7351 + // try to resolve proxies here, otherwise we don't know editor input + if (modelObject.eIsProxy()) { + resolvedObject = EmfModelQuery.resolveProxy(editor.getProcess(), modelObject); + } + } + else + resolvedObject = modelObject; + + if (resolvedObject==null) { + // https://issues.jboss.org/browse/JBIDE-8601 + MessageDialog.openError(editor.getEditorSite().getShell(), + Messages.BPELUtil__Error, NLS.bind( + Messages.BPELUtil_NoEditorForObject, + (new Object[] { modelObject.getClass().getSimpleName() }))); + return; + } + IFile file = BPELUtil.getFileFromURI(resolvedObject.eResource().getURI()); IDE.openEditor(editor.getSite().getWorkbenchWindow().getActivePage(), file); } catch (PartInitException ex) { BPELUIPlugin.log(ex, IStatus.WARNING);

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29863 - in workspace/mareshkau/xulrunner-1.9.2.15: org.mozilla.xpcom.source/META-INF and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: mareshkau Date: 2011-03-17 08:58:55 -0400 (Thu, 17 Mar 2011) New Revision: 29863 Modified: workspace/mareshkau/xulrunner-1.9.2.15/org.mozilla.xpcom.source/META-INF/MANIFEST.MF workspace/mareshkau/xulrunner-1.9.2.15/org.mozilla.xpcom/META-INF/MANIFEST.MF workspace/mareshkau/xulrunner-1.9.2.15/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF Log: bundle version updated Modified: workspace/mareshkau/xulrunner-1.9.2.15/org.mozilla.xpcom/META-INF/MANIFEST.MF =================================================================== --- workspace/mareshkau/xulrunner-1.9.2.15/org.mozilla.xpcom/META-INF/MANIFEST.MF 2011-03-17 10:16:42 UTC (rev 29862) +++ workspace/mareshkau/xulrunner-1.9.2.15/org.mozilla.xpcom/META-INF/MANIFEST.MF 2011-03-17 12:58:55 UTC (rev 29863) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Mozilla XPCOM Eclipse plugin Bundle-SymbolicName: org.mozilla.xpcom;singleton:=true -Bundle-Version: 1.9.1.17 +Bundle-Version: 1.9.2.15 Bundle-ClassPath: MozillaGlue.jar,MozillaInterfaces.jar, bin/ Export-Package: org.mozilla.interfaces, Modified: workspace/mareshkau/xulrunner-1.9.2.15/org.mozilla.xpcom.source/META-INF/MANIFEST.MF =================================================================== --- workspace/mareshkau/xulrunner-1.9.2.15/org.mozilla.xpcom.source/META-INF/MANIFEST.MF 2011-03-17 10:16:42 UTC (rev 29862) +++ workspace/mareshkau/xulrunner-1.9.2.15/org.mozilla.xpcom.source/META-INF/MANIFEST.MF 2011-03-17 12:58:55 UTC (rev 29863) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Mozilla XPCOM For Java Bundle-SymbolicName: org.mozilla.xpcom.source;singleton:=true -Bundle-Version: 1.9.1.17 +Bundle-Version: 1.9.2.15 Bundle-ClassPath: MozillaInterfaces.jar Bundle-Vendor: mozilla.org Require-Bundle: org.eclipse.pde.ui Modified: workspace/mareshkau/xulrunner-1.9.2.15/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF =================================================================== --- workspace/mareshkau/xulrunner-1.9.2.15/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF 2011-03-17 10:16:42 UTC (rev 29862) +++ workspace/mareshkau/xulrunner-1.9.2.15/org.mozilla.xulrunner.gtk.linux.x86/META-INF/MANIFEST.MF 2011-03-17 12:58:55 UTC (rev 29863) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Mozilla Xulrunner Bundle-SymbolicName: org.mozilla.xulrunner.gtk.linux.x86;singleton:=true -Bundle-Version: 1.9.1.17 +Bundle-Version: 1.9.2.15 Bundle-Vendor: mozilla.org Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86))

13 years, 10 months

1
0
0 / 0

JBoss Tools SVN: r29861 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.

by jbosstools-commits＠lists.jboss.org

Author: adietish Date: 2011-03-17 05:51:07 -0400 (Thu, 17 Mar 2011) New Revision: 29861 Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties Log: [JBIDE-8148] internationalized messages Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-03-17 09:12:42 UTC (rev 29860) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/EditCloudConnectionWizard.java 2011-03-17 09:51:07 UTC (rev 29861) @@ -10,8 +10,6 @@ *******************************************************************************/ package org.jboss.tools.internal.deltacloud.ui.wizards; -import java.text.MessageFormat; - import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -54,7 +52,7 @@ private boolean editCloud(final DeltaCloud cloud, final String name, final String url, final String username, final String password, final DeltaCloudDriver driver) { try { - Job job = new AbstractCloudJob(MessageFormat.format("Edit cloud \"{0}\"", cloud.getName()), cloud) { + Job job = new AbstractCloudJob(WizardMessages.getFormattedString("EditCloudConnection.message", cloud.getName()), cloud) { @Override protected IStatus doRun(IProgressMonitor monitor) throws Exception { Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-03-17 09:12:42 UTC (rev 29860) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-03-17 09:51:07 UTC (rev 29861) @@ -10,8 +10,6 @@ *******************************************************************************/ package org.jboss.tools.internal.deltacloud.ui.wizards; -import java.text.MessageFormat; - import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; @@ -125,7 +123,7 @@ private boolean createCloud(final String name, final String url, final String username, final String password, final DeltaCloudDriver driver) { - Job job = new Job(MessageFormat.format("Create cloud \"{0}\"", name)) { + Job job = new Job(WizardMessages.getFormattedString("CloudConnection.msg", name)) { @Override protected IStatus run(IProgressMonitor monitor) { @@ -136,7 +134,7 @@ } catch (Exception e) { // TODO internationalize strings return StatusFactory.getInstance(IStatus.ERROR, Activator.PLUGIN_ID, - MessageFormat.format("Could not create cloud {0}", name), e); + WizardMessages.getFormattedString("CloudConnectionError.msg", name), e); } } Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties =================================================================== --- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2011-03-17 09:12:42 UTC (rev 29860) +++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/WizardMessages.properties 2011-03-17 09:51:07 UTC (rev 29861) @@ -11,6 +11,8 @@ CloudConnection.desc=Specify connection details for a cloud you wish to access CloudConnection.title=Cloud Connection CloudConnection.name=Cloud Connection +CloudConnection.msg=Create cloud {0} +CloudConnectionError.msg=Could not create cloud {0} CloudConnectionTestSuccess.msg=Connection Test successful CloudConnectionTestFailure.msg=Connection Test failed CloudConnectionTestingCredentials.msg=Testing credentials... @@ -18,6 +20,7 @@ NewCloudConnection.name=New Cloud Connection EditCloudConnection.name=Edit Cloud Connection +EditCloudConnection.message=Edit cloud {0} EditCloudConnectionError.title=Error Editing Cloud Connection EditCloudConnectionError.message=Could not open connection wizard

13 years, 10 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits March 2011