JBoss Tools SVN: r20048 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-02-01 08:42:37 -0500 (Mon, 01 Feb 2010)
New Revision: 20048
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesInfoDialog.java
Log:
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesInfoDialog.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesInfoDialog.java 2010-02-01 13:35:55 UTC (rev 20047)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/ProjectNaturesInfoDialog.java 2010-02-01 13:42:37 UTC (rev 20048)
@@ -44,7 +44,7 @@
private Button button;
private Link link;
private boolean isRemember = false;
- private static final String QUESTION = "Don't show this dialog again!"; //$NON-NLS-1$
+ private static final String QUESTION = "Do not show this dialog again!"; //$NON-NLS-1$
private static final String TITLE = "Missing Natures"; //$NON-NLS-1$
private IProject project;
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r20047 - trunk/cdi/plugins/org.jboss.tools.cdi.core/images/ca.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-02-01 08:35:55 -0500 (Mon, 01 Feb 2010)
New Revision: 20047
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/images/ca/icons_CDI_EL.gif
Log:
https://jira.jboss.org/jira/browse/JBIDE-5770
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/images/ca/icons_CDI_EL.gif
===================================================================
(Binary files differ)
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r20046 - in trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui: search and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-02-01 07:53:56 -0500 (Mon, 01 Feb 2010)
New Revision: 20046
Added:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointMatch.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointMatchPresentation.java
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3125
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2010-02-01 12:53:56 UTC (rev 20046)
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.cdi.ui;
+
+import org.eclipse.osgi.util.NLS;
+
+public class CDIUIMessages extends NLS{
+ private static final String BUNDLE_NAME = "org.jboss.tools.cdi.ui.CDIUIMessages"; //$NON-NLS-1$
+
+ static {
+ NLS.initializeMessages(BUNDLE_NAME, CDIUIMessages.class);
+ }
+
+ public static String INJECTION_POINT_LABEL_PROVIDER;
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-02-01 12:53:56 UTC (rev 20046)
@@ -0,0 +1,12 @@
+##################################################################################
+### Copyright (c) 2010 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
+##################################################################################
+
+INJECTION_POINT_LABEL_PROVIDER=Injected class
\ No newline at end of file
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2010-02-01 12:53:56 UTC (rev 20046)
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.cdi.ui.search;
+
+import org.eclipse.jdt.ui.ISharedImages;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.swt.graphics.Image;
+import org.jboss.tools.cdi.core.IBean;
+import org.jboss.tools.cdi.ui.CDIUIMessages;
+
+public class InjectionPointLabelProvider implements ILabelProvider {
+
+ public Image getImage(Object element) {
+ return JavaUI.getSharedImages().getImage(ISharedImages.IMG_OBJS_CLASS);
+ }
+
+ public String getText(Object element) {
+ if(element instanceof IBean){
+ return CDIUIMessages.INJECTION_POINT_LABEL_PROVIDER+" "+((IBean)element).getBeanClass().getElementName(); //$NON-NLS-1$
+ }else
+ return ""; //$NON-NLS-1$
+ }
+
+ public void addListener(ILabelProviderListener listener) {
+ }
+
+ public void dispose() {
+ }
+
+ public boolean isLabelProperty(Object element, String property) {
+ return false;
+ }
+
+ public void removeListener(ILabelProviderListener listener) {
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointMatch.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointMatch.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointMatch.java 2010-02-01 12:53:56 UTC (rev 20046)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.cdi.ui.search;
+
+import org.eclipse.search.ui.text.Match;
+import org.jboss.tools.cdi.core.IBean;
+
+public class InjectionPointMatch extends Match {
+ private IBean bean;
+ public InjectionPointMatch(IBean bean, int offset, int length){
+ super(bean, offset, length);
+ this.bean = bean;
+ }
+
+ public IBean getBean(){
+ return bean;
+ }
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointMatch.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointMatchPresentation.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointMatchPresentation.java (rev 0)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointMatchPresentation.java 2010-02-01 12:53:56 UTC (rev 20046)
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.cdi.ui.search;
+
+import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jdt.ui.JavaUI;
+import org.eclipse.jdt.ui.search.IMatchPresentation;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.search.ui.text.Match;
+import org.eclipse.ui.PartInitException;
+import org.jboss.tools.cdi.ui.CDIUIPlugin;
+
+public class InjectionPointMatchPresentation implements IMatchPresentation {
+ private static InjectionPointLabelProvider labelProvider = new InjectionPointLabelProvider();
+
+ public ILabelProvider createLabelProvider() {
+ return labelProvider;
+ }
+
+ public void showMatch(Match match, int currentOffset, int currentLength,
+ boolean activate) throws PartInitException {
+ if(match instanceof InjectionPointMatch){
+ try{
+ JavaUI.openInEditor(((InjectionPointMatch)match).getBean().getBeanClass());
+ }catch(JavaModelException ex){
+ CDIUIPlugin.getDefault().logError(ex);
+ }catch(PartInitException ex){
+ CDIUIPlugin.getDefault().logError(ex);
+ }
+ }
+ }
+
+}
Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointMatchPresentation.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java 2010-02-01 12:41:34 UTC (rev 20045)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointQueryParticipant.java 2010-02-01 12:53:56 UTC (rev 20046)
@@ -46,7 +46,7 @@
}
public IMatchPresentation getUIParticipant() {
- return null;
+ return new InjectionPointMatchPresentation();
}
public void search(ISearchRequestor requestor,
@@ -88,7 +88,7 @@
if(bean != null){
IType type = bean.getBeanClass();
ISourceRange range = ((Member)type).getNameRange();
- Match match = new Match(type.getResource(), range.getOffset(), range.getLength());
+ Match match = new InjectionPointMatch(bean, range.getOffset(), range.getLength());
requestor.reportMatch(match);
}
}
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r20045 - in trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context: basic and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-02-01 07:41:34 -0500 (Mon, 01 Feb 2010)
New Revision: 20045
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitProperties.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyListListener.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateBasic.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5182
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.java 2010-02-01 12:27:09 UTC (rev 20044)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.java 2010-02-01 12:41:34 UTC (rev 20045)
@@ -19,7 +19,6 @@
import org.eclipse.jpt.utility.internal.model.value.ItemPropertyListValueModelAdapter;
import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
import org.eclipse.jpt.utility.model.value.ListValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibernateProperties;
@@ -29,8 +28,7 @@
* @author Dmitry Geraskov
*
*/
-public class HibernateJpaProperties extends AbstractModel implements
- HibernateProperties {
+public class HibernateJpaProperties extends AbstractModel {
private PersistenceUnit persistenceUnit;
@@ -56,7 +54,7 @@
}
private ListValueModel<Property> buildPropertyListAdapter(ListValueModel<Property> propertiesAdapter) {
- return new ItemPropertyListValueModelAdapter<Property>(propertiesAdapter, Property.VALUE_PROPERTY);
+ return new ItemPropertyListValueModelAdapter<Property>(propertiesAdapter, Property.VALUE_PROPERTY, Property.NAME_PROPERTY);
}
private ListValueModel<Property> buildPropertiesAdapter(PropertyValueModel<PersistenceUnit> subjectHolder) {
@@ -94,15 +92,4 @@
return this.persistenceUnit.getJpaProject();
}
- public boolean itemIsProperty(Property item) {
- throw new UnsupportedOperationException();
- }
-
- public void propertyChanged(PropertyChangeEvent event) {
- throw new UnsupportedOperationException();
- }
-
- public String propertyIdFor(Property property) {
- throw new UnsupportedOperationException();
- }
-}
+}
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitProperties.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitProperties.java 2010-02-01 12:27:09 UTC (rev 20044)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitProperties.java 2010-02-01 12:41:34 UTC (rev 20045)
@@ -41,4 +41,6 @@
* Return the JPA project the PersistenceUnit belongs to.
*/
JpaProject getJpaProject();
+
+ void updateProperties();
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyListListener.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyListListener.java 2010-02-01 12:27:09 UTC (rev 20044)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyListListener.java 2010-02-01 12:41:34 UTC (rev 20045)
@@ -10,12 +10,7 @@
******************************************************************************/
package org.jboss.tools.hibernate.jpt.core.internal.context;
-import java.util.Iterator;
-
-import org.eclipse.jpt.core.context.persistence.PersistenceUnit.Property;
-import org.eclipse.jpt.utility.model.Model;
import org.eclipse.jpt.utility.model.event.ListChangeEvent;
-import org.eclipse.jpt.utility.model.event.PropertyChangeEvent;
import org.eclipse.jpt.utility.model.listener.ListChangeListener;
/**
@@ -31,68 +26,29 @@
this.parent = parent;
}
- // ********** Behavior **********
- protected boolean add(Property newItem, Model source) {
- if (this.model().itemIsProperty(newItem)) {
- String propertyName = this.model().propertyIdFor(newItem);
- this.model().propertyChanged(
- new PropertyChangeEvent(source, propertyName, null, newItem));
- return true;
- }
- return false;
- }
-
- protected boolean remove(Property item, Model source) {
- if (this.model().itemIsProperty(item)) {
- String propertyName = this.model().propertyIdFor(item);
- this.model().propertyChanged(
- new PropertyChangeEvent(source, propertyName, item, null)); // oldItem is the removed property
- return true;
- }
- return false;
- }
-
- // replace
- protected Property set(Property newItem, Model source) {
- if (this.model().itemIsProperty(newItem)) {
- String propertyName = this.model().propertyIdFor(newItem);
- this.model().propertyChanged(
- new PropertyChangeEvent(source, propertyName, null, newItem)); // oldItem unknown
- return newItem;
- }
- return null;
- }
-
// ********** ListChangeListener implementation **********
public void itemsAdded(ListChangeEvent e) {
- for (Iterator<Property> stream = this.items(e); stream.hasNext();) {
- this.add(stream.next(), e.getSource());
- }
+ model().updateProperties();
}
public void itemsRemoved(ListChangeEvent e) {
- for (Iterator<Property> stream = this.items(e); stream.hasNext();) {
- this.remove(stream.next(), e.getSource());
- }
+ model().updateProperties();
}
public void itemsReplaced(ListChangeEvent e) {
- // ItemAspectListValueModelAdapter(270) does not provide old value
- for (Iterator<Property> newStream = this.items(e); newStream.hasNext();) {
- this.set(newStream.next(), e.getSource());
- }
+ model().updateProperties();
}
public void itemsMoved(ListChangeEvent e) {
- throw new UnsupportedOperationException("source: " + e.getSource() + " - aspect: " + e.getAspectName()); //$NON-NLS-1$//$NON-NLS-2$
+ model().updateProperties();
}
public void listCleared(ListChangeEvent e) {
- throw new UnsupportedOperationException("source: " + e.getSource() + " - aspect: " + e.getAspectName()); //$NON-NLS-1$//$NON-NLS-2$
+ model().updateProperties();
}
public void listChanged(ListChangeEvent e) {
- throw new UnsupportedOperationException("source: " + e.getSource() + " - aspect: " + e.getAspectName()); //$NON-NLS-1$//$NON-NLS-2$
+ model().updateProperties();
}
// ********** internal methods **********
@@ -100,9 +56,4 @@
return this.parent;
}
- @SuppressWarnings("unchecked")
- private Iterator<Property> items(ListChangeEvent event) {
- return (Iterator<Property>) event.items();
- }
-
-}
+}
\ No newline at end of file
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateBasic.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateBasic.java 2010-02-01 12:27:09 UTC (rev 20044)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateBasic.java 2010-02-01 12:41:34 UTC (rev 20045)
@@ -125,6 +125,7 @@
}
public void setConfigurationFile(String newConfigFile) {
+ if (!valueWasChanged(configFile, newConfigFile)) return;
String old = this.configFile;
this.configFile = newConfigFile;
this.putProperty(CONFIG_FILE_PROPERTY, newConfigFile);
@@ -148,6 +149,7 @@
}
public void setDialect(String newDialect) {
+ if (!valueWasChanged(dialect, newDialect)) return;
String old = this.dialect;
this.dialect = newDialect;
this.putProperty(DIALECT_PROPERTY, newDialect);
@@ -171,6 +173,7 @@
}
public void setDriver(String newDriver) {
+ if (!valueWasChanged(driver, newDriver)) return;
String old = this.driver;
this.driver = newDriver;
this.putProperty(DRIVER_PROPERTY, newDriver);
@@ -194,6 +197,7 @@
}
public void setUrl(String newUrl) {
+ if (!valueWasChanged(url, newUrl)) return;
String old = this.url;
this.url = newUrl;
this.putProperty(URL_PROPERTY, newUrl);
@@ -217,6 +221,7 @@
}
public void setSchemaDefault(String newSchemaDefault) {
+ if (!valueWasChanged(schemaDefault, newSchemaDefault)) return;
String old = this.schemaDefault;
this.schemaDefault = newSchemaDefault;
this.putProperty(SCHEMA_DEFAULT_PROPERTY, newSchemaDefault);
@@ -240,6 +245,7 @@
}
public void setCatalogDefault(String newCatalogDefault) {
+ if (!valueWasChanged(catalogDefault, newCatalogDefault)) return;
String old = this.catalogDefault;
this.catalogDefault = newCatalogDefault;
this.putProperty(CATALOG_DEFAULT_PROPERTY, newCatalogDefault);
@@ -263,6 +269,7 @@
}
public void setUsername(String newUsername) {
+ if (!valueWasChanged(username, newUsername)) return;
String old = this.username;
this.username = newUsername;
this.putProperty(USERNAME_PROPERTY, newUsername);
@@ -286,6 +293,7 @@
}
public void setPassword(String newPassword) {
+ if (!valueWasChanged(password, newPassword)) return;
String old = this.password;
this.password = newPassword;
this.putProperty(PASSWORD_PROPERTY, newPassword);
@@ -299,4 +307,20 @@
this.firePropertyChanged(event.getAspectName(), old, newPassword);
}
+ public void updateProperties() {
+ setConfigurationFile(this.getStringValue(HIBERNATE_CONFIG_FILE));
+ setDialect(this.getStringValue(HIBERNATE_DIALECT));
+ setDriver(this.getStringValue(HIBERNATE_DRIVER));
+ setUrl(this.getStringValue(HIBERNATE_URL));
+ setSchemaDefault(this.getStringValue(HIBERNATE_SCHEMA_DEFAULT));
+ setCatalogDefault(this.getStringValue(HIBERNATE_CATALOG));
+ setUsername(this.getStringValue(HIBERNATE_USERNAME));
+ setPassword(this.getStringValue(HIBERNATE_PASSWORD));
+ }
+
+ private boolean valueWasChanged(String oldValue, String newValue){
+ return oldValue == null ? newValue != null
+ : !oldValue.equals(newValue);
+ }
+
}
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r20044 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-02-01 07:27:09 -0500 (Mon, 01 Feb 2010)
New Revision: 20044
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
Log:
https://jira.jboss.org/jira/browse/JBIDE-5762 - fixed
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2010-02-01 11:49:49 UTC (rev 20043)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/IVpePreferencesPage.java 2010-02-01 12:27:09 UTC (rev 20044)
@@ -19,6 +19,7 @@
static final String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL = "Show Resource Bundles Usage as EL Expressions"; //$NON-NLS-1$
static final String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT = "Ask for tag attributes during tag insert"; //$NON-NLS-1$
static final String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR = "Ask for confirmation when closing Selection Bar"; //$NON-NLS-1$
+ static final String IGNORE_VPE_WARNINGS = "Ignore Visual Editor warnings"; //$NON-NLS-1$
static final String DEFAULT_VPE_TAB = "Default VPE Tab"; //$NON-NLS-1$
static final String VISUAL_SOURCE_EDITORS_SPLITTING = "Visual/Source Editors Splitting"; //$NON-NLS-1$
static final String VISUAL_SOURCE_EDITORS_WEIGHTS = "Size of Visual Editor Pane 0-100%"; //$NON-NLS-1$
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2010-02-01 11:49:49 UTC (rev 20043)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/preferences/VpePreferencesInitializer.java 2010-02-01 12:27:09 UTC (rev 20044)
@@ -29,6 +29,7 @@
defaultPreferences.putBoolean(IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, false);
defaultPreferences.putBoolean(IVpePreferencesPage.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, true);
defaultPreferences.putBoolean(IVpePreferencesPage.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, true);
+ defaultPreferences.putBoolean(IVpePreferencesPage.IGNORE_VPE_WARNINGS, false);
defaultPreferences.put(IVpePreferencesPage.DEFAULT_VPE_TAB, IVpePreferencesPage.DEFAULT_VPE_TAB_VISUAL_SOURCE_VALUE);
defaultPreferences.put(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_SPLITTING, IVpePreferencesPage.SPLITTING_VERT_TOP_SOURCE_VALUE);
defaultPreferences.putInt(IVpePreferencesPage.VISUAL_SOURCE_EDITORS_WEIGHTS, IVpePreferencesPage.DEFAULT_VISUAL_SOURCE_EDITORS_WEIGHTS);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2010-02-01 11:49:49 UTC (rev 20043)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/VpePlugin.java 2010-02-01 12:27:09 UTC (rev 20044)
@@ -55,10 +55,8 @@
*/
public void stop(BundleContext context) throws Exception {
ProjectNaturesChecker naturesChecker = ProjectNaturesChecker.getInstance();
- if (naturesChecker != null) {
- naturesChecker.dispose();
- naturesChecker = null;
- }
+ naturesChecker.dispose();
+ naturesChecker = null;
super.stop(context);
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-02-01 11:49:49 UTC (rev 20043)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeEditorPart.java 2010-02-01 12:27:09 UTC (rev 20044)
@@ -1009,13 +1009,10 @@
}
public void partOpened(IWorkbenchPart part) {
- if (part == multiPageEditor) {
+ if (!JspEditorPlugin.getDefault().getPreferenceStore().
+ getBoolean(IVpePreferencesPage.IGNORE_VPE_WARNINGS)) {
try {
- IEditorInput editorInput = multiPageEditor.getEditorInput();
- if (editorInput instanceof IFileEditorInput) {
- naturesChecker = ProjectNaturesChecker.getInstance();
- naturesChecker.checkNatures(((IFileEditorInput)editorInput).getFile().getProject());
- }
+ checkNaturesFromPart(part);
} catch (CoreException e) {
VpePlugin.getPluginLog().logError(e);
}
@@ -1239,4 +1236,14 @@
}
}
+ private void checkNaturesFromPart(IWorkbenchPart part) throws CoreException{
+ if (part == multiPageEditor) {
+ IEditorInput editorInput = multiPageEditor.getEditorInput();
+ if (editorInput instanceof IFileEditorInput) {
+ naturesChecker = ProjectNaturesChecker.getInstance();
+ naturesChecker.checkNatures(((IFileEditorInput)editorInput).getFile().getProject());
+ }
+ }
+ }
+
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2010-02-01 11:49:49 UTC (rev 20043)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/preferences/VpePreferencesPage.java 2010-02-01 12:27:09 UTC (rev 20044)
@@ -50,12 +50,12 @@
SPLITTING_HORIZ_LEFT_SOURCE_VALUE },
{ VpeUIMessages.SPLITTING_HORIZ_LEFT_VISUAL,
SPLITTING_HORIZ_LEFT_VISUAL_VALUE } };
-
+
private Composite pageContainer;
private Group visualAppearanceGroup;
private Group confirmationGroup;
private Group tabsGroup;
-
+
public VpePreferencesPage() {
super();
setPreferenceStore(getPreferenceStore());
@@ -70,59 +70,60 @@
public String getTitle() {
return VpeUIMessages.GENERAL_TAB_TITLE;
}
-
+
@Override
protected Control createContents(Composite parent) {
-
+
pageContainer = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.marginHeight = 10;
- layout.marginWidth = 10;
- layout.horizontalSpacing = 10;
- layout.verticalSpacing = 10;
- GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
- pageContainer.setLayout(layout);
- pageContainer.setLayoutData(gd);
-
- visualAppearanceGroup = new Group(pageContainer, SWT.SHADOW_ETCHED_IN);
- visualAppearanceGroup.setText(VpeUIMessages.VISUAL_APPEARANCE_GROUP_TITLE);
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 1;
+ layout.marginHeight = 10;
+ layout.marginWidth = 10;
+ layout.horizontalSpacing = 10;
+ layout.verticalSpacing = 10;
+ GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1);
+ pageContainer.setLayout(layout);
+ pageContainer.setLayoutData(gd);
+
+ visualAppearanceGroup = new Group(pageContainer, SWT.SHADOW_ETCHED_IN);
+ visualAppearanceGroup
+ .setText(VpeUIMessages.VISUAL_APPEARANCE_GROUP_TITLE);
layout = new GridLayout();
layout.marginHeight = 10;
- layout.marginWidth = 10;
- layout.horizontalSpacing = 10;
- layout.verticalSpacing = 10;
+ layout.marginWidth = 10;
+ layout.horizontalSpacing = 10;
+ layout.verticalSpacing = 10;
visualAppearanceGroup.setLayout(layout);
gd = new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1);
visualAppearanceGroup.setLayoutData(gd);
-
+
confirmationGroup = new Group(pageContainer, SWT.SHADOW_ETCHED_IN);
confirmationGroup.setText(VpeUIMessages.CONFIRMATION_GROUP_TITLE);
layout = new GridLayout();
layout.marginHeight = 10;
- layout.marginWidth = 10;
- layout.horizontalSpacing = 10;
- layout.verticalSpacing = 10;
+ layout.marginWidth = 10;
+ layout.horizontalSpacing = 10;
+ layout.verticalSpacing = 10;
confirmationGroup.setLayout(layout);
gd = new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1);
confirmationGroup.setLayoutData(gd);
-
+
tabsGroup = new Group(pageContainer, SWT.SHADOW_ETCHED_IN);
tabsGroup.setText(VpeUIMessages.TABS_GROUP_TITLE);
layout = new GridLayout();
layout.marginHeight = 10;
- layout.marginWidth = 10;
+ layout.marginWidth = 10;
tabsGroup.setLayout(layout);
gd = new GridData(SWT.FILL, SWT.NONE, true, false, 1, 1);
tabsGroup.setLayoutData(gd);
-
+
createFieldEditors();
initialize();
- checkState();
-
+ checkState();
+
return pageContainer;
}
-
+
@Override
protected Composite getFieldEditorParent() {
return pageContainer;
@@ -131,7 +132,8 @@
@Override
protected void createFieldEditors() {
addField(new BooleanFieldEditor(SHOW_BORDER_FOR_UNKNOWN_TAGS,
- VpeUIMessages.SHOW_BORDER_FOR_UNKNOWN_TAGS, visualAppearanceGroup));
+ VpeUIMessages.SHOW_BORDER_FOR_UNKNOWN_TAGS,
+ visualAppearanceGroup));
addField(new BooleanFieldEditor(SHOW_NON_VISUAL_TAGS,
VpeUIMessages.SHOW_NON_VISUAL_TAGS, visualAppearanceGroup));
addField(new BooleanFieldEditor(SHOW_SELECTION_TAG_BAR,
@@ -139,15 +141,23 @@
addField(new BooleanFieldEditor(SHOW_TEXT_FORMATTING,
VpeUIMessages.SHOW_TEXT_FORMATTING, visualAppearanceGroup));
addField(new BooleanFieldEditor(SHOW_RESOURCE_BUNDLES_USAGE_AS_EL,
- VpeUIMessages.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL, visualAppearanceGroup));
+ VpeUIMessages.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL,
+ visualAppearanceGroup));
addField(new BooleanFieldEditor(ASK_TAG_ATTRIBUTES_ON_TAG_INSERT,
- VpeUIMessages.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT, confirmationGroup));
- addField(new BooleanFieldEditor(ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR,
- VpeUIMessages.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR, confirmationGroup));
+ VpeUIMessages.ASK_TAG_ATTRIBUTES_ON_TAG_INSERT,
+ confirmationGroup));
+ addField(new BooleanFieldEditor(
+ ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR,
+ VpeUIMessages.ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR,
+ confirmationGroup));
+ addField(new BooleanFieldEditor(IGNORE_VPE_WARNINGS,
+ VpeUIMessages.IGNORE_VPE_WARNINGS, confirmationGroup));
addField(new VpeComboFieldEditor(DEFAULT_VPE_TAB,
- VpeUIMessages.DEFAULT_VPE_TAB, DEFAULT_VPE_TAB_COMBO_BOX_VALUES, tabsGroup));
+ VpeUIMessages.DEFAULT_VPE_TAB,
+ DEFAULT_VPE_TAB_COMBO_BOX_VALUES, tabsGroup));
addField(new VpeComboFieldEditor(VISUAL_SOURCE_EDITORS_SPLITTING,
- VpeUIMessages.VISUAL_SOURCE_EDITORS_SPLITTING, SPLITTING_COMBO_BOX_VALUES, tabsGroup));
+ VpeUIMessages.VISUAL_SOURCE_EDITORS_SPLITTING,
+ SPLITTING_COMBO_BOX_VALUES, tabsGroup));
addField(new SliderFieldEditor(VISUAL_SOURCE_EDITORS_WEIGHTS,
VpeUIMessages.VISUAL_SOURCE_EDITORS_WEIGHTS, tabsGroup));
}
@@ -155,11 +165,14 @@
@Override
public boolean performOk() {
super.performOk();
- IEditorReference[] editors = VpePlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getEditorReferences();
+ IEditorReference[] editors = VpePlugin.getDefault().getWorkbench()
+ .getActiveWorkbenchWindow().getActivePage()
+ .getEditorReferences();
for (IEditorReference editor : editors) {
IEditorPart editorPart = editor.getEditor(false);
- if ((editorPart != null) && (editorPart instanceof JSPMultiPageEditor)) {
- JSPMultiPageEditor mpe = (JSPMultiPageEditor)editorPart;
+ if ((editorPart != null)
+ && (editorPart instanceof JSPMultiPageEditor)) {
+ JSPMultiPageEditor mpe = (JSPMultiPageEditor) editorPart;
IVisualEditor visualEditor = (mpe).getVisualEditor();
if (visualEditor instanceof VpeEditorPart) {
VpeEditorPart vep = (VpeEditorPart) visualEditor;
@@ -168,16 +181,16 @@
*/
vep.updatePartAccordingToPreferences();
/*
- * Change selected tab
- * Commented to fix https://jira.jboss.org/jira/browse/JBIDE-4941
- * Do not update VPE splitting, weights, tabs for current page,
- * only for newly opened.
+ * Change selected tab Commented to fix
+ * https://jira.jboss.org/jira/browse/JBIDE-4941 Do not
+ * update VPE splitting, weights, tabs for current page,
+ * only for newly opened.
*/
-// mpe.updatePartAccordingToPreferences();
+ // mpe.updatePartAccordingToPreferences();
}
}
}
-
+
return true;
}
@@ -185,5 +198,5 @@
public IPreferenceStore getPreferenceStore() {
return JspEditorPlugin.getDefault().getPreferenceStore();
}
-
+
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-02-01 11:49:49 UTC (rev 20043)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/VpeUIMessages.java 2010-02-01 12:27:09 UTC (rev 20044)
@@ -129,6 +129,7 @@
public static String SHOW_BUNDLES_AS_MESSAGES;
public static String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT;
public static String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR;
+ public static String IGNORE_VPE_WARNINGS;
public static String DEFAULT_VPE_TAB;
public static String VISUAL_SOURCE_EDITORS_SPLITTING;
public static String VISUAL_SOURCE_EDITORS_WEIGHTS;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-02-01 11:49:49 UTC (rev 20043)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-02-01 12:27:09 UTC (rev 20044)
@@ -112,6 +112,7 @@
SHOW_BUNDLES_AS_MESSAGES=Show bundle's messages explicitly
ASK_TAG_ATTRIBUTES_ON_TAG_INSERT=Ask for tag attributes during tag insert
ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR=Ask for confirmation when closing Selection Bar
+IGNORE_VPE_WARNINGS=Ignore Visual Editor warnings
DEFAULT_VPE_TAB=Select the default active editor's tab
VISUAL_SOURCE_EDITORS_SPLITTING=Visual/Source editors splitting
VISUAL_SOURCE_EDITORS_WEIGHTS=Size of the Visual Editor pane (0-100%)
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r20043 - in trunk/jsf: tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2010-02-01 06:49:49 -0500 (Mon, 01 Feb 2010)
New Revision: 20043
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfView.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-5218, JsfView template and junit were updated.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfView.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfView.java 2010-02-01 09:24:15 UTC (rev 20042)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/src/org/jboss/tools/jsf/vpe/jsf/template/JsfView.java 2010-02-01 11:49:49 UTC (rev 20043)
@@ -80,17 +80,19 @@
* These expressions are parsed before template creating
* in VpeVisualDomBuilder, f:view template has already got parsed el.
*
- * 1.2 If there is a default locale specified - use it in any case,
- * otherwise get the locale from the attribute.
+ * 1.2 If there is a defined locale - use it in any case,
+ * otherwise get the default locale from the faces-config.
*/
- String defaultLocaleString = MainLocaleProvider.getInstance().getLocaleString();
- if (ComponentUtil.isNotBlank(defaultLocaleString)) {
- localeString = defaultLocaleString;
+ String localeAttribute = sourceElement.getAttribute(ATTR_LOCALE);
+ String defaultLocaleString = Constants.EMPTY;
+ if (ComponentUtil.isNotBlank(localeAttribute)) {
+ localeString = localeAttribute;
+ } else if (ComponentUtil
+ .isNotBlank(defaultLocaleString = MainLocaleProvider
+ .getInstance().getLocaleString())) {
+ localeString = defaultLocaleString;
} else {
- String localeAttribute = sourceElement.getAttribute(ATTR_LOCALE);
- if (ComponentUtil.isNotBlank(localeAttribute)) {
- localeString = localeAttribute;
- }
+ localeString = Constants.EMPTY;
}
/*
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java 2010-02-01 09:24:15 UTC (rev 20042)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/TestFViewLocaleAttribute_JBIDE5218.java 2010-02-01 11:49:49 UTC (rev 20043)
@@ -97,7 +97,7 @@
nsIDOMDocument doc = controller.getXulRunnerEditor().getDOMDocument();
nsIDOMElement localeText = doc.getElementById(LOCALE_TEXT_ID);
String localizedText = getLocalizedText(localeText);
- assertTrue("Text is '"+localizedText+"', but should be should be in 'de' locale", HELLO_EN_US.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Text is '"+localizedText+"', but should be should be in 'de' locale", HELLO2_DE.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
closeEditors();
}
@@ -115,11 +115,11 @@
nsIDOMElement localeText = doc.getElementById(LOCALE_TEXT0_ID);
String localizedText = getLocalizedText(localeText);
- assertTrue("Text is '"+localizedText+"', but should be in 'en_US' locale", HELLO_EN_US.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Text is '"+localizedText+"', but should be in 'en' locale", HELLO_EN.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
localeText = doc.getElementById(LOCALE_TEXT1_ID);
localizedText = getLocalizedText(localeText);
- assertTrue("Text is '"+localizedText+"', but should be in 'en_US' locale", HELLO_EN_US.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Text is '"+localizedText+"', but should be in 'de' locale", HELLO2_DE.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
localeText = doc.getElementById(LOCALE_TEXT2_ID);
localizedText = getLocalizedText(localeText);
@@ -127,7 +127,7 @@
localeText = doc.getElementById(LOCALE_TEXT_ID);
localizedText = getLocalizedText(localeText);
- assertTrue("Text is '"+localizedText+"', but should be in 'en_US' locale", HELLO_EN_US.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Text is '"+localizedText+"', but should be in 'en_GB' locale", HELLO_EN_GB.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
closeEditors();
}
@@ -146,7 +146,7 @@
nsIDOMDocument doc = controller.getXulRunnerEditor().getDOMDocument();
nsIDOMElement localeText = doc.getElementById(LOCALE_TEXT_ID);
String localizedText = getLocalizedText(localeText);
- assertTrue("Text is '"+localizedText+"', but should be in 'en_US' locale", HELLO_EN_US.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Text is '"+localizedText+"', but should be in 'de' locale", HELLO2_DE.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
/*
* Change the locale
*/
@@ -164,7 +164,7 @@
/*
* Check the new localized message.
*/
- assertTrue("Text is '"+localizedText+"', but should be in 'en_US' locale", HELLO_EN_US.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
+ assertTrue("Text is '"+localizedText+"', but should be in 'en_GB' locale", HELLO_EN_GB.equalsIgnoreCase(localizedText)); //$NON-NLS-1$ //$NON-NLS-2$
closeEditors();
}
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r20042 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks: editor and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2010-02-01 04:24:15 -0500 (Mon, 01 Feb 2010)
New Revision: 20042
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.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/graphical/editors/SmooksGraphicalEditorPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java
Log:
JBIDE-5754
done
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2010-02-01 07:50:20 UTC (rev 20041)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMultiFormEditor.java 2010-02-01 09:24:15 UTC (rev 20042)
@@ -22,7 +22,9 @@
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
@@ -107,12 +109,14 @@
addValidateListener(processPage);
addSmooksEditorInitListener(processPage);
try {
- int index = this.addPage(processPage);
+ int index = this.addPage(processPage );
setPageText(index, Messages.SmooksMultiFormEditor_processtabel_label);
} catch (PartInitException e) {
e.printStackTrace();
}
}
+
+
// private void addSmooksGraphicalEditor() {
// graphicalPage = new SmooksGraphicalEditorPart(this);
@@ -125,6 +129,36 @@
// }
// }
+ /* (non-Javadoc)
+ * @see org.eclipse.ui.forms.editor.FormEditor#getActiveEditor()
+ */
+ @Override
+ public IEditorPart getActiveEditor() {
+ int index = getActivePage();
+ if (index != -1) {
+ IEditorPart part = getEditor(index);
+ if(part == null){
+// if(index == 0){
+// part = processPage;
+// }
+// if(index == 1){
+// part = configurationPage;
+// }
+ }
+ return part;
+ }
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.editor.AbstractSmooksFormEditor#init(org.eclipse.ui.IEditorSite, org.eclipse.ui.IEditorInput)
+ */
+ @Override
+ public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+ super.init(site, input);
+// site.setSelectionProvider(this);
+ }
+
public Object getAdapter(Class adapter) {
if (adapter == IPropertySheetPage.class) {
tabbedPropertySheetPage = new TabbedPropertySheetPage(this);
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 2010-02-01 07:50:20 UTC (rev 20041)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2010-02-01 09:24:15 UTC (rev 20042)
@@ -714,7 +714,7 @@
validator = new SmooksModelValidator();
addValidateListener(this);
}
-
+
RuntimeMetadata runtimeMetadata = new RuntimeMetadata();
String filePath = null;
IFile file = null;
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 2010-02-01 07:50:20 UTC (rev 20041)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2010-02-01 09:24:15 UTC (rev 20042)
@@ -60,6 +60,7 @@
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.swt.SWT;
@@ -802,7 +803,7 @@
@Override
protected void hookGraphicalViewer() {
- super.hookGraphicalViewer();
+ getSelectionSynchronizer().addViewer(getGraphicalViewer());
getGraphicalViewer().addSelectionChangedListener(getSelectionSynchronizer());
getGraphicalViewer().addSelectionChangedListener(this);
}
@@ -1340,6 +1341,10 @@
public void selectionChanged(SelectionChangedEvent event) {
updateActions(getSelectionActions());
+ ISelectionProvider provider = ((SmooksTaskDetailsEditorSite)getSite()).getMultiPageEditor().getSite().getSelectionProvider();
+ if(provider != null){
+ provider.setSelection(event.getSelection());
+ }
}
public void sourceChange(Object model) {
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 2010-02-01 07:50:20 UTC (rev 20041)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2010-02-01 09:24:15 UTC (rev 20042)
@@ -40,6 +40,7 @@
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.swt.SWT;
@@ -258,6 +259,7 @@
highlightGraphNode(item);
}
showTaskControl(firstElement);
+ SmooksProcessGraphicalEditor.this.selectionChanged(event);
}
});
}
@@ -790,6 +792,10 @@
}
public void selectionChanged(SelectionChangedEvent event) {
+ ISelectionProvider provider = getEditor().getSite().getSelectionProvider();
+ if(provider != null){
+ provider.setSelection(event.getSelection());
+ }
}
protected Control createTaskPanel(Composite parent, FormToolkit toolkit, String taskID) {
14 years, 2 months
- 1
- 0
JBoss Tools SVN: r20041 - in trunk/esb/tests/org.jboss.tools.esb.project.core.test: projects and 15 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2010-02-01 02:50:20 -0500 (Mon, 01 Feb 2010)
New Revision: 20041
Added:
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.classpath
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.project
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.eclipse.jdt.core.prefs
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.eclipse.wst.common.component
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.jboss.tools.esb.project.core.prefs
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/build/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/build/classes/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/esbcontent/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/esbcontent/META-INF/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/esbcontent/META-INF/jboss-esb.xml
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/esbcontent/jbm-queue-service.xml
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/src/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbp1/esbcontent/jbm-queue-service.xml
trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/
trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java
Removed:
trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbp1/src/jbm-queue-service.xml
Modified:
trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF
Log:
JBIDE-5572:Add unit tests for ESB
Modified: trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF 2010-01-31 23:05:57 UTC (rev 20040)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF 2010-02-01 07:50:20 UTC (rev 20041)
@@ -5,3 +5,13 @@
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: org.junit;bundle-version="3.8.2",
+ org.jboss.tools.esb.project.core;bundle-version="1.0.0",
+ org.eclipse.wst.common.project.facet.core;bundle-version="1.4.0",
+ org.eclipse.wst.server.core;bundle-version="1.1.101",
+ org.eclipse.core.resources;bundle-version="3.5.0",
+ org.eclipse.core.runtime;bundle-version="3.5.0",
+ org.jboss.tools.common.test;bundle-version="2.0.0",
+ org.eclipse.jdt.core;bundle-version="3.5.0",
+ org.jboss.ide.eclipse.as.core;bundle-version="1.0.0",
+ org.eclipse.jdt.launching;bundle-version="3.5.0"
Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.classpath
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.classpath (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.classpath 2010-02-01 07:50:20 UTC (rev 20041)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_14">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.jboss.esb.runtime.classpath/server.supplied"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.project
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.project (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.project 2010-02-01 07:50:20 UTC (rev 20041)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>esbTestProject</name>
+ <comment></comment>
+ <projects>
+ <project>esbTestProject</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.eclipse.jdt.core.prefs 2010-02-01 07:50:20 UTC (rev 20041)
@@ -0,0 +1,7 @@
+#Fri Jan 15 00:13:10 CST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.eclipse.wst.common.component 2010-02-01 07:50:20 UTC (rev 20041)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="esbTestProject">
+ <wb-resource deploy-path="/" source-path="/esbcontent"/>
+ <dependent-module deploy-path="/" handle="module:/org.jboss.ide.eclipse.as.wtp.core.vcf.outputFolders/">
+ <dependency-type>consumes</dependency-type>
+ </dependent-module>
+ <property name="java-output-path" value="build/classes"/>
+ </wb-module>
+</project-modules>
Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-02-01 07:50:20 UTC (rev 20041)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.jboss.esb"/>
+ <installed facet="jst.java" version="6.0"/>
+ <installed facet="jst.jboss.esb" version="4.7"/>
+</faceted-project>
Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.jboss.tools.esb.project.core.prefs
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.jboss.tools.esb.project.core.prefs (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/.settings/org.jboss.tools.esb.project.core.prefs 2010-02-01 07:50:20 UTC (rev 20041)
@@ -0,0 +1,3 @@
+#Fri Jan 15 00:13:10 CST 2010
+eclipse.preferences.version=1
+jboss.esb.project.project.version=2.0
Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/esbcontent/META-INF/jboss-esb.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/esbcontent/META-INF/jboss-esb.xml (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/esbcontent/META-INF/jboss-esb.xml 2010-02-01 07:50:20 UTC (rev 20041)
@@ -0,0 +1,3 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+<jbossesb xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..." parameterReloadSecs="5">
+</jbossesb>
\ No newline at end of file
Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/esbcontent/jbm-queue-service.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/esbcontent/jbm-queue-service.xml (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbTestProject/esbcontent/jbm-queue-service.xml 2010-02-01 07:50:20 UTC (rev 20041)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Copied: trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbp1/esbcontent/jbm-queue-service.xml (from rev 19705, trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbp1/src/jbm-queue-service.xml)
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbp1/esbcontent/jbm-queue-service.xml (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbp1/esbcontent/jbm-queue-service.xml 2010-02-01 07:50:20 UTC (rev 20041)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+ <mbean code="org.jboss.jms.server.destination.QueueService"
+ name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw"
+ xmbean-dd="xmdesc/Queue-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+</server>
Deleted: trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbp1/src/jbm-queue-service.xml
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbp1/src/jbm-queue-service.xml 2010-01-31 23:05:57 UTC (rev 20040)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/projects/esbp1/src/jbm-queue-service.xml 2010-02-01 07:50:20 UTC (rev 20041)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_esb"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.esb.quickstart.destination:service=Queue,name=quickstart_helloworld_Request_gw"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-</server>
Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java (rev 0)
+++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/src/org/jboss/tools/esb/project/core/test/ESBProjectDeploymentTest.java 2010-02-01 07:50:20 UTC (rev 20041)
@@ -0,0 +1,269 @@
+package org.jboss.tools.esb.project.core.test;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jdt.launching.IVMInstall;
+import org.eclipse.jdt.launching.JavaRuntime;
+import org.eclipse.wst.common.project.facet.core.IFacetedProject;
+import org.eclipse.wst.common.project.facet.core.IProjectFacet;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
+import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IModuleType;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeType;
+import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
+import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.IServerType;
+import org.eclipse.wst.server.core.IServerWorkingCopy;
+import org.eclipse.wst.server.core.ServerCore;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.internal.ModuleFactory;
+import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy;
+import org.eclipse.wst.server.core.internal.ServerPlugin;
+import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
+import org.eclipse.wst.server.core.model.IModuleResource;
+import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
+import org.jboss.tools.common.test.util.TestProjectProvider;
+import org.jboss.tools.esb.core.ESBProjectConstant;
+
+public class ESBProjectDeploymentTest extends TestCase {
+ public static final IVMInstall VM_INSTALL = JavaRuntime
+ .getDefaultVMInstall();
+
+ public static final String JBOSS_AS_42_HOME = System.getProperty(
+ "jbosstools.test.jboss.home.4.2",
+ "/home/fugang/jboss-all/jboss-soa-p.5.0.0/jboss-as");
+ public static final String JBOSS_AS_50_HOME = System.getProperty(
+ "jbosstools.test.jboss.home.5.0",
+ "/home/fugang/jboss-all/jboss-soa-p.5.0.0/jboss-as");
+ public static final String JBOSS_AS_51_HOME = System.getProperty(
+ "jbosstools.test.jboss.home.5.1",
+ "/home/fugang/jboss-all/jboss-5.1.0.GA");
+ public static final String SERVER_SOAP43_HOME = System.getProperty(
+ "jbosstools.test.soap.home.4.3",
+ "/home/fugang/jboss-all/jboss-soa-p.5.0.0") + "//jboss-as";
+ public static final String SERVER_SOAP50_HOME = System.getProperty(
+ "jbosstools.test.soap.home.5.0",
+ "/home/fugang/jboss-all/jboss-soa-p.5.0.0") + "//jboss-as";
+
+ static String BUNDLE = "org.jboss.tools.esb.project.core.test";
+ IProject project;
+
+ private IRuntime soap50_runtime;
+ private IRuntime currentRuntime;
+ private IServer currentServer;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ soap50_runtime = createRuntime(IJBossToolingConstants.EAP_50,
+ SERVER_SOAP50_HOME, "default");
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ soap50_runtime.delete();
+ if (project != null) {
+ project.delete(true, null);
+ }
+
+ if (currentRuntime != null) {
+ currentRuntime.delete();
+ currentServer.delete();
+ }
+ }
+
+ public IProject createESBProject(String prjName) throws CoreException {
+ TestProjectProvider provider = new TestProjectProvider(BUNDLE,
+ "/projects/" + prjName, prjName, true);
+ IProject prj = provider.getProject();
+ IFacetedProject ifp = ProjectFacetsManager.create(prj);
+
+ org.eclipse.wst.common.project.facet.core.runtime.IRuntime fruntime = RuntimeManager
+ .getRuntime(IJBossToolingConstants.EAP_50);
+ ifp.addTargetedRuntime(fruntime, null);
+ ifp.setPrimaryRuntime(fruntime, null);
+ prj.build(IncrementalProjectBuilder.FULL_BUILD, null);
+
+ return prj;
+ }
+
+ public void testCheckModuleFactoryByESBFacet() throws CoreException {
+ project = createESBProject("esbTestProject");
+
+ Map<String, ModuleFactory> mpESBFactories = getAllAvailableESBModuleFactories();
+
+ IProjectFacet facets = ProjectFacetsManager
+ .getProjectFacet(ESBProjectConstant.ESB_PROJECT_FACET);
+ for (IProjectFacetVersion fv : facets.getVersions()) {
+ String version = fv.getVersionString();
+ ModuleFactory factory = mpESBFactories.get(version);
+ assertNotNull("There is no module factory for ESB " + version,
+ factory);
+
+ IModule[] modules = factory.getModules();
+
+ IModuleResource[] res = factory.getDelegate(null)
+ .getModuleDelegate(modules[0]).members();
+ assertEquals(
+ "Deployment logic is not correct for ESB"+ fv.getVersionString()+", some artifacts were lost",
+ 3, res.length);
+ }
+
+ }
+
+ public void testSOAP50Deployment() throws Exception {
+ testESBDeployment(IJBossToolingConstants.EAP_50,
+ IJBossToolingConstants.SERVER_EAP_50, SERVER_SOAP50_HOME);
+ }
+
+ public void testSOAP43Deployment() throws Exception {
+ testESBDeployment(IJBossToolingConstants.EAP_43,
+ IJBossToolingConstants.SERVER_EAP_43, SERVER_SOAP43_HOME);
+ }
+
+ public void testJBossServer50Deployment() throws Exception {
+ testESBDeployment(IJBossToolingConstants.AS_50,
+ IJBossToolingConstants.SERVER_AS_50, JBOSS_AS_50_HOME);
+ }
+
+ public void testJbossServer51Deployment() throws Exception {
+ testESBDeployment(IJBossToolingConstants.AS_51,
+ IJBossToolingConstants.SERVER_AS_51, JBOSS_AS_51_HOME);
+ }
+
+ public void testJbossServer42Deployment() throws Exception {
+ testESBDeployment(IJBossToolingConstants.AS_42,
+ IJBossToolingConstants.SERVER_AS_42, JBOSS_AS_42_HOME);
+ }
+
+ private void testESBDeployment(String runtimeId, String serverid,
+ String serverHome) throws Exception {
+ File archive = null;
+ try {
+ createServer(runtimeId, serverid, serverHome, "default");
+ project = createESBProject("esbTestProject");
+ publishESBProject();
+
+ // check deployment result
+ IPath serverPath = new Path(serverHome);
+ serverPath.append("server").append("default").append("deploy");
+ serverPath.append("esbTestProject.esb");
+ archive = serverPath.toFile();
+ assertTrue("Deploy failed, nothing was deployed to server", archive
+ .exists());
+
+ if (archive.isDirectory()) {
+ serverPath.append("META-INF");
+ assertTrue(
+ "generated a wrong ESB archive, no META-INF in the archive",
+ serverPath.toFile().exists());
+
+ serverPath.removeLastSegments(1);
+ serverPath
+ .append("org\\jboss\\soa\\esb\\samples\\quickstart\\helloworld");
+ serverPath.append("MyJMSListenerAction.class");
+ assertTrue("no class was pick up into the archive", serverPath
+ .toFile().exists());
+ }
+ else{
+ ZipFile azip = new ZipFile(archive);
+ ZipEntry entry = azip.getEntry("META-INF");
+ assertNotNull("generated a wrong ESB archive, no META-INF in the archive", entry);
+ entry = azip.getEntry("org");
+ assertNotNull("there is no class in the esb archive", entry);
+
+ }
+ } finally {
+ if (archive != null) {
+ archive.delete();
+ }
+ }
+ }
+
+ protected void publishESBProject() throws CoreException {
+ IModule[] modules = ServerUtil.getModules(currentServer.getServerType()
+ .getRuntimeType().getModuleTypes());
+ IServerWorkingCopy serverWC = currentServer.createWorkingCopy();
+ serverWC.modifyModules(modules, null, null);
+ serverWC.save(true, null).publish(0, null);
+ currentServer.publish(IServer.PUBLISH_FULL, null);
+
+ }
+
+
+ private Map<String, ModuleFactory> getAllAvailableESBModuleFactories() {
+ Map<String, ModuleFactory> mpFactory = new HashMap<String, ModuleFactory>();
+ for (ModuleFactory factory : ServerPlugin.getModuleFactories()) {
+ for (IModuleType type : factory.getModuleTypes()) {
+ if (type.getId().equals(ESBProjectConstant.ESB_PROJECT_FACET)) {
+ mpFactory.put(type.getVersion(), factory);
+ }
+ }
+ }
+
+ return mpFactory;
+ }
+
+ private IRuntime createRuntime(String runtimeId, String homeDir,
+ String config) throws CoreException {
+ IRuntimeType[] runtimeTypes = ServerUtil.getRuntimeTypes(null, null,
+ runtimeId);
+ assertEquals("expects only one runtime type", runtimeTypes.length, 1);
+ IRuntimeType runtimeType = runtimeTypes[0];
+ IRuntimeWorkingCopy runtimeWC = runtimeType.createRuntime(null,
+ new NullProgressMonitor());
+ runtimeWC.setName(runtimeId);
+ runtimeWC.setLocation(new Path(homeDir));
+ ((RuntimeWorkingCopy) runtimeWC).setAttribute(
+ IJBossServerRuntime.PROPERTY_VM_ID, VM_INSTALL.getId());
+ ((RuntimeWorkingCopy) runtimeWC).setAttribute(
+ IJBossServerRuntime.PROPERTY_VM_TYPE_ID, VM_INSTALL
+ .getVMInstallType().getId());
+ ((RuntimeWorkingCopy) runtimeWC).setAttribute(
+ IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME, config);
+ IRuntime savedRuntime = runtimeWC.save(true, new NullProgressMonitor());
+ return savedRuntime;
+ }
+
+ protected void createServer(String runtimeID, String serverID,
+ String location, String configuration) throws CoreException {
+ // if file doesnt exist, abort immediately.
+ assertTrue(new Path(location).toFile().exists());
+
+ currentRuntime = createRuntime(runtimeID, location, configuration);
+ IServerType serverType = ServerCore.findServerType(serverID);
+ IServerWorkingCopy serverWC = serverType.createServer(null, null,
+ new NullProgressMonitor());
+ serverWC.setRuntime(currentRuntime);
+ serverWC.setName(serverID);
+ serverWC.setServerConfiguration(null);
+ IPath path = new Path(location).append("server").append("default")
+ .append("deploy");
+ ((ServerWorkingCopy) serverWC).setAttribute(
+ DeployableServer.DEPLOY_DIRECTORY, path.toOSString());
+ currentServer = serverWC.save(true, new NullProgressMonitor());
+
+ }
+
+}
14 years, 2 months
- 1
- 0