JBoss Tools SVN: r10743 - in trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el: internal/core/model and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-08 10:06:11 -0400 (Wed, 08 Oct 2008)
New Revision: 10743
Added:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/model/ELMultiExpression.java
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELMultiExpressionImpl.java
Log:
JBIDE-1497.
Interface added
Added: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/model/ELMultiExpression.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/model/ELMultiExpression.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/model/ELMultiExpression.java 2008-10-08 14:06:11 UTC (rev 10743)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2007 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.el.core.model;
+
+import java.util.List;
+
+import org.jboss.tools.common.el.internal.core.model.ELOperatorImpl;
+
+/**
+ * expression (operation expression)+
+ * @author V. Kabanovich
+ */
+public interface ELMultiExpression {
+
+ public List<ELExpression> getExpressions();
+
+ public List<ELOperatorImpl> getOperators();
+
+}
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELMultiExpressionImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELMultiExpressionImpl.java 2008-10-08 13:47:19 UTC (rev 10742)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/internal/core/model/ELMultiExpressionImpl.java 2008-10-08 14:06:11 UTC (rev 10743)
@@ -13,7 +13,9 @@
import java.util.ArrayList;
import java.util.List;
+import org.jboss.tools.common.el.core.model.ELExpression;
import org.jboss.tools.common.el.core.model.ELInvocationExpression;
+import org.jboss.tools.common.el.core.model.ELMultiExpression;
import org.jboss.tools.common.el.core.model.ELObject;
import org.jboss.tools.common.el.core.model.ELObjectType;
@@ -21,14 +23,14 @@
* expression (operation expression)+
* @author V. Kabanovich
*/
-public class ELMultiExpressionImpl extends ELExpressionImpl {
- List<ELExpressionImpl> expressions = new ArrayList<ELExpressionImpl>();
+public class ELMultiExpressionImpl extends ELExpressionImpl implements ELMultiExpression {
+ List<ELExpression> expressions = new ArrayList<ELExpression>();
List<ELOperatorImpl> operators = new ArrayList<ELOperatorImpl>();
public ELMultiExpressionImpl() {
}
- public List<ELExpressionImpl> getExpressions() {
+ public List<ELExpression> getExpressions() {
return expressions;
}
@@ -79,8 +81,8 @@
}
public void collectInvocations(List<ELInvocationExpression> list) {
- for (ELExpressionImpl expr: expressions) {
- expr.collectInvocations(list);
+ for (ELExpression expr: expressions) {
+ ((ELExpressionImpl)expr).collectInvocations(list);
}
}
16 years, 3 months
JBoss Tools SVN: r10742 - in trunk/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2008-10-08 09:47:19 -0400 (Wed, 08 Oct 2008)
New Revision: 10742
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2731
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2008-10-08 13:23:14 UTC (rev 10741)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2008-10-08 13:47:19 UTC (rev 10742)
@@ -17,8 +17,10 @@
import org.eclipse.core.runtime.FileLocator;
import org.eclipse.core.runtime.Platform;
import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider;
+import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor;
import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences;
/**
* Data model provider for Seam facet wizard page
@@ -137,4 +139,27 @@
Platform.getBundle(SeamCorePlugin.PLUGIN_ID).getEntry(
"/templates")).getPath()); //$NON-NLS-1$
}
-}
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider#init()
+ */
+ @Override
+ public void init() {
+ super.init();
+ model.setProperty(ISeamFacetDataModelProperties.DB_TYPE, SeamProjectPreferences.getStringPreference(SeamProjectPreferences.HIBERNATE_DEFAULT_DB_TYPE));
+ model.setProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, SeamProjectPreferences.getStringPreference(SeamProjectPreferences.SEAM_DEFAULT_CONNECTION_PROFILE));
+ model.setProperty(ISeamFacetDataModelProperties.DB_DEFAULT_SCHEMA_NAME, "");
+ model.setProperty(ISeamFacetDataModelProperties.DB_DEFAULT_CATALOG_NAME, "");
+ model.setProperty(ISeamFacetDataModelProperties.DB_ALREADY_EXISTS, false);
+ model.setProperty(ISeamFacetDataModelProperties.RECREATE_TABLES_AND_DATA_ON_DEPLOY, false);
+ if(model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)!=null) {
+ model.setProperty(ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME, "org.domain." + model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) + ".session"); //$NON-NLS-1$
+ model.setProperty(ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, "org.domain." + model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) + ".entity"); //$NON-NLS-1$
+ model.setProperty(ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, "org.domain." + model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) + ".test"); //$NON-NLS-1$
+ }
+ // TODO
+// jBossSeamHome
+// jBossAsDeployAs
+ }
+}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-10-08 13:23:14 UTC (rev 10741)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-10-08 13:47:19 UTC (rev 10742)
@@ -53,7 +53,6 @@
import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage;
import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage;
-import org.eclipse.wst.common.project.facet.ui.ModifyFacetedProjectWizard;
import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard;
import org.hibernate.eclipse.console.utils.DriverClassHelpers;
import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -155,27 +154,6 @@
}
/**
- * This method is useful for seam facet modify wizard.
- */
- private void initModel() {
- synchEditorsAndModel(jBossHibernateDbTypeEditor);
-// synchEditorsAndModel(jBossSeamHomeEditor);
- synchEditorsAndModel(jBossAsDeployAsEditor);
- synchEditorsAndModel(connProfileSelEditor);
- synchEditorsAndModel(dbSchemaName);
- synchEditorsAndModel(dbCatalogName);
- synchEditorsAndModel(dbTablesExists);
- synchEditorsAndModel(recreateTablesOnDeploy);
- synchEditorsAndModel(sessionBeanPkgNameditor);
- synchEditorsAndModel(entityBeanPkgNameditor);
- synchEditorsAndModel(testsPkgNameditor);
- }
-
- private void synchEditorsAndModel(IFieldEditor editor) {
- model.setProperty(editor.getName(), editor.getValue());
- }
-
- /**
* @return
*/
private String getDefaultDbType() {
@@ -270,10 +248,6 @@
model.setProperty(ISeamFacetDataModelProperties.HIBERNATE_DIALECT,
HIBERNATE_HELPER.getDialectClass(jBossHibernateDbTypeEditor.getValueAsString()));
-
- if(!isNewProjectWizard()) {
- initModel();
- }
}
/**
16 years, 3 months
JBoss Tools SVN: r10741 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog.
by jbosstools-commits＠lists.jboss.org
Author: dsakovich
Date: 2008-10-08 09:23:14 -0400 (Wed, 08 Oct 2008)
New Revision: 10741
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
Log:
code adjustment
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2008-10-08 13:23:01 UTC (rev 10740)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2008-10-08 13:23:14 UTC (rev 10741)
@@ -21,6 +21,7 @@
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.window.Window;
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.events.DisposeEvent;
@@ -71,13 +72,15 @@
final static String CSS_FILE_SELECT_DIALOG = "Select CSS file from the tree:";
final static String CSS_FILE_SELECT_DIALOG_EMPTY_MESSAGE = "No CSS file in the current project";
final static String SKIP_FIRST_CHAR = ".";
-
+
/**
*
* @param parentShell
- * @param allProject (if allProject is true - browse css file in all projects, else only in current project)
+ * @param allProject
+ * (if allProject is true - browse css file in all projects, else
+ * only in current project)
*/
- public CSSClassDialog(Shell parentShell,boolean allProject) {
+ public CSSClassDialog(Shell parentShell, boolean allProject) {
super(parentShell);
this.allProject = allProject;
setShellStyle(getShellStyle() | SWT.RESIZE | SWT.MAX
@@ -120,22 +123,22 @@
IResource res = null;
if (allProject) {
IWorkspace workspace = ResourcesPlugin.getWorkspace();
- res = workspace.getRoot().findMember(text.getText());
+ res = workspace.getRoot().findMember(text.getText());
} else {
IProject project = Util.getCurrentProject();
- if (project!=null)
+ if (project != null)
res = project.findMember(text.getText());
}
-
+
if (res != null) {
if (res instanceof IFile) {
- file = (IFile) res;
- cssModel = new CSSModel(file);
- classCombo.removeAll();
- List<String> selectors = cssModel.getSelectors();
- for (String selector : selectors) {
- classCombo.add(selector);
- }
+ file = (IFile) res;
+ cssModel = new CSSModel(file);
+ classCombo.removeAll();
+ List<String> selectors = cssModel.getSelectors();
+ for (String selector : selectors) {
+ classCombo.add(selector);
+ }
}
}
}
@@ -150,7 +153,8 @@
.getImageDescriptor(Constants.IMAGE_FOLDERLARGE_FILE_LOCATION);
Image image = imageDesc.createImage();
button.setImage(image);
- button.setToolTipText(MessageUtil.getString("CSS_BROWSE_BUTTON_TOOLTIP"));
+ button.setToolTipText(MessageUtil
+ .getString("CSS_BROWSE_BUTTON_TOOLTIP"));
button.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
Button button = (Button) e.getSource();
@@ -170,19 +174,18 @@
classCombo.addSelectionListener(new SelectionListener() {
public void widgetDefaultSelected(SelectionEvent e) {
-
+
}
public void widgetSelected(SelectionEvent e) {
String style = cssModel.getStyle(classCombo.getText());
- classCombo.setToolTipText(cssModel.getCSSText(classCombo.getText()));
+ classCombo.setToolTipText(cssModel.getCSSText(classCombo
+ .getText()));
styleComposite.recreateStyleComposite(style);
}
-
+
});
-
-
-
+
button.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent event) {
@@ -201,12 +204,13 @@
dialog.setAllowMultiple(false);
dialog
.setEmptyListMessage(CSS_FILE_SELECT_DIALOG_EMPTY_MESSAGE);
- dialog.open();
- IResource res = (IResource) dialog.getFirstResult();
- if (allProject) {
- text.setText(res.getFullPath().toOSString());
- } else {
- text.setText(res.getProjectRelativePath().toOSString());
+ if (dialog.open() == Window.OK) {
+ IResource res = (IResource) dialog.getFirstResult();
+ if (allProject) {
+ text.setText(res.getFullPath().toOSString());
+ } else {
+ text.setText(res.getProjectRelativePath().toOSString());
+ }
}
}
});
@@ -237,7 +241,7 @@
return composite;
}
-
+
public void saveChanges() {
styleComposite.updateStyle();
String newStyle = styleComposite.getNewStyle();
@@ -246,9 +250,9 @@
}
public String getSelectorName() {
- return selectorName;
+ return selectorName;
}
-
+
/**
* Method for creating dialog area
*
@@ -256,9 +260,9 @@
*
*/
protected Control createDialogArea(final Composite parent) {
-
+
final Composite composite = (Composite) super.createDialogArea(parent);
-
+
return createDialogComposite(composite);
}
@@ -281,7 +285,4 @@
selectorName = sel;
super.okPressed();
}
-
-
-
}
16 years, 3 months
JBoss Tools SVN: r10740 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-10-08 09:23:01 -0400 (Wed, 08 Oct 2008)
New Revision: 10740
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1913
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java 2008-10-08 13:21:36 UTC (rev 10739)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java 2008-10-08 13:23:01 UTC (rev 10740)
@@ -225,19 +225,21 @@
IPath[] paths = DialogSelectionHelper.chooseFileEntries(getShell(), (IPath)null, new Path[0],
title, description,
new String[0], isPath, true, false);//$NON-NLS-1$
- strPath = paths[0].toOSString();
- if (isPath){
- for (int i = 1; i < paths.length; i++) {
- strPath += File.pathSeparator + paths[i].toOSString();
- }
- }
+ if (paths != null && paths.length > 0){
+ strPath = paths[0].toOSString();
+ if (isPath){
+ for (int i = 1; i < paths.length; i++) {
+ strPath += File.pathSeparator + paths[i].toOSString();
+ }
+ }
+ }
} else return;
String oldPath = ((Text)value).getText();
if (isPath && oldPath.trim().length() > 0 && strPath != null)
((Text)value).setText( oldPath + File.pathSeparator + strPath );
else {
- if (strPath == null) strPath = "";
- ((Text)value).setText( strPath );
+ if (strPath != null)
+ ((Text)value).setText( strPath );
}
}
};
16 years, 3 months
JBoss Tools SVN: r10739 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: editor and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-10-08 09:21:36 -0400 (Wed, 08 Oct 2008)
New Revision: 10739
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DndUtil.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java
Log:
=processing of url transfer was added, because when me make external drag&drop under linux, we should processed this transfer
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DndUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DndUtil.java 2008-10-08 11:11:00 UTC (rev 10738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/DndUtil.java 2008-10-08 13:21:36 UTC (rev 10739)
@@ -15,6 +15,7 @@
import org.eclipse.swt.events.TypedEvent;
import org.jboss.tools.common.model.ui.editors.dnd.context.DropContext;
import org.jboss.tools.common.model.ui.editors.dnd.context.IDNDTextEditor;
+import org.jboss.tools.vpe.editor.util.VpeDebugUtil;
import org.jboss.tools.vpe.xulrunner.XPCOM;
import org.mozilla.interfaces.nsIComponentManager;
import org.mozilla.interfaces.nsIDOMEvent;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-10-08 11:11:00 UTC (rev 10738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-10-08 13:21:36 UTC (rev 10739)
@@ -164,8 +164,8 @@
import org.mozilla.interfaces.nsISelectionListener;
import org.mozilla.interfaces.nsISupports;
import org.mozilla.interfaces.nsISupportsCString;
+import org.mozilla.interfaces.nsISupportsString;
import org.mozilla.xpcom.Mozilla;
-import org.mozilla.xpcom.XPCOMException;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -2782,33 +2782,6 @@
return tagname;
}
- /**
- * Determine is nsIFile instance.
- *
- * @param support
- * @return
- */
- private boolean isNsIFileInstance(nsISupports support) {
- boolean rst = true;
-
- try {
- support.queryInterface(nsIFile.NS_IFILE_IID);
- } catch (XPCOMException e) {
- rst = false;
- }
- return rst;
- }
-
- private boolean isNsIStringInstance(nsISupports support) {
- boolean rst = true;
-
- try {
- support.queryInterface(nsISupportsCString.NS_ISUPPORTSCSTRING_IID);
- } catch (XPCOMException e) {
- rst = false;
- }
- return rst;
- }
public void externalDrop(nsIDOMMouseEvent mouseEvent, String flavor, String data) {
onHideTooltip();
@@ -2823,19 +2796,23 @@
// if(object == null)
nsISupports aValue = DndUtil.getDnDValue(mouseEvent);
- String aFlavor = "";
- if (isNsIFileInstance(aValue)) {
+ String aFlavor = ""; //$NON-NLS-1$
+ if (VpeDndUtil.isNsIFileInstance(aValue)) {
nsIFile aFile = (nsIFile) aValue.queryInterface(nsIFile.NS_IFILE_IID);
-
+
if (aValue != null) {
data = aFile.getPath();
aFlavor = DndUtil.kFileMime;
}
- } else if (isNsIStringInstance(aValue)) {
+ } else if (VpeDndUtil.isNsICStringInstance(aValue)) {
nsISupportsCString aString = (nsISupportsCString) aValue.queryInterface(nsISupportsCString.NS_ISUPPORTSCSTRING_IID);
data = aString.getData();
aFlavor = DndUtil.kHTMLMime;
+ } else if (VpeDndUtil.isNsIStringInstance(aValue)) {
+ nsISupportsString aString = (nsISupportsString) aValue.queryInterface(nsISupportsString.NS_ISUPPORTSSTRING_IID);
+ data = aString.getData();
+ aFlavor = DndUtil.kURLMime;
}
// if (object.getFileType() == XModelObject.FILE
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java 2008-10-08 11:11:00 UTC (rev 10738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/VpeDndUtil.java 2008-10-08 13:21:36 UTC (rev 10739)
@@ -19,20 +19,26 @@
import org.jboss.tools.common.model.ui.editor.IModelObjectEditorInput;
import org.jboss.tools.common.model.ui.views.palette.PaletteInsertHelper;
import org.jboss.tools.vpe.VpePlugin;
+import org.mozilla.interfaces.nsIFile;
+import org.mozilla.interfaces.nsISupports;
+import org.mozilla.interfaces.nsISupportsCString;
+import org.mozilla.interfaces.nsISupportsString;
+import org.mozilla.xpcom.XPCOMException;
public class VpeDndUtil {
- public static boolean isDropEnabled(IModelObjectEditorInput input) {
- return DnDUtil.isPasteEnabled(input.getXModelObject());
+
+ public static boolean isDropEnabled(IModelObjectEditorInput input) {
+ return DnDUtil.isPasteEnabled(input.getXModelObject());
}
public static void drop(IModelObjectEditorInput input,
ISourceViewer viewer, ISelectionProvider provider) {
Properties properties = new Properties();
- properties.setProperty("isDrop", "true");
- properties.setProperty("actionSourceGUIComponentID", "editor");
- properties.setProperty("accepsAsString", "true");
- properties.put("selectionProvider", provider);
- properties.put("viewer", viewer);
+ properties.setProperty("isDrop", "true"); //$NON-NLS-1$//$NON-NLS-2$
+ properties.setProperty("actionSourceGUIComponentID", "editor"); //$NON-NLS-1$//$NON-NLS-2$
+ properties.setProperty("accepsAsString", "true"); //$NON-NLS-1$//$NON-NLS-2$
+ properties.put("selectionProvider", provider); //$NON-NLS-1$
+ properties.put("viewer", viewer); //$NON-NLS-1$
try {
DnDUtil.paste(input.getXModelObject(), properties);
@@ -41,5 +47,52 @@
VpePlugin.getPluginLog().logError(ex);
}
}
+
+ /**
+ * Determine is nsIFile instance.
+ *
+ * @param support
+ * @return
+ */
+ public static boolean isNsIFileInstance(nsISupports support) {
+ boolean rst = true;
+
+ try {
+ support.queryInterface(nsIFile.NS_IFILE_IID);
+ } catch (XPCOMException e) {
+ rst = false;
+ }
+ return rst;
+ }
+ /**
+ * Determine is csstring instance
+ * @param support
+ * @return
+ */
+ public static boolean isNsICStringInstance(nsISupports support) {
+ boolean rst = true;
+ try {
+ support.queryInterface(nsISupportsCString.NS_ISUPPORTSCSTRING_IID);
+ } catch (XPCOMException e) {
+ rst = false;
+ }
+ return rst;
+ }
+ /**
+ * Determine is string instance
+ * @param support
+ * @return
+ */
+ public static boolean isNsIStringInstance(nsISupports support) {
+ boolean rst = true;
+
+ try {
+ support.queryInterface(nsISupportsString.NS_ISUPPORTSSTRING_IID);
+ } catch (XPCOMException e) {
+ rst = false;
+ }
+ return rst;
+ }
+
}
16 years, 3 months
JBoss Tools SVN: r10738 - trunk/birt/docs/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2008-10-08 07:11:00 -0400 (Wed, 08 Oct 2008)
New Revision: 10738
Modified:
trunk/birt/docs/en/modules/birt_designer.xml
Log:
Modified: trunk/birt/docs/en/modules/birt_designer.xml
===================================================================
--- trunk/birt/docs/en/modules/birt_designer.xml 2008-10-08 11:06:52 UTC (rev 10737)
+++ trunk/birt/docs/en/modules/birt_designer.xml 2008-10-08 11:11:00 UTC (rev 10738)
@@ -12,37 +12,45 @@
<title>BIRT Designer</title>
- <para>There are a number of ways we can improve the report's appearance: </para>
-
- <itemizedlist><listitem><para>Add a title to the top of the report;</para></listitem>
+
- Add a title to the top of the report.
- Add some color to enhance the column headings.
- Shrink the size of the city and state columns.
- Add some color to make the state and city group headers stand out.
- Format the phone numbers.
- Sort customers by name.
- </itemizedlist>
-
-
-
-
<section id="birt_designer_introduction">
- <title>BIRT Designer</title>
- <para> text here</para>
+ <title>BIRT Report Designer</title>
+ <para>BIRT Designer is an intuitive and quite easy Eclipse-based set of plugins to make reports. We will pass you through all its features.</para>
+
</section>
<section id="birt_designer_features">
- <title>BIRT Designer Features</title>
- <para>text here</para>
+ <title>BIRT Report Designer Features</title>
+ <para>Here are the main BIRT Report Designer features:</para>
+ <itemizedlist><listitem><para><emphasis role="bold"></emphasis>Palette - Contains the standard BIRT report elements such as labels, tables, and charts and is used in conjunction with the Layout View to design reports.</para></listitem>
+
+
+
+ </itemizedlist>
+
+
+ <para>There are a number of ways we can improve the report's appearance: </para>
+
+ <itemizedlist><listitem><para>Add a title to the top of the report;</para></listitem>
+
+
+
+ Add a title to the top of the report.
+ Add some color to enhance the column headings.
+ Shrink the size of the city and state columns.
+ Add some color to make the state and city group headers stand out.
+ Format the phone numbers.
+ Sort customers by name.
+ </itemizedlist>
</section>
</chapter>
16 years, 3 months
JBoss Tools SVN: r10737 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse: launch and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2008-10-08 07:06:52 -0400 (Wed, 08 Oct 2008)
New Revision: 10737
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-1913
Added despotic call of selectionChangeListener
Combo dialog layout fixed
Null path selection error fixed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2008-10-08 10:57:44 UTC (rev 10736)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2008-10-08 11:06:52 UTC (rev 10737)
@@ -494,7 +494,9 @@
public static String ExporterSettingsTab_template_directory_for;
public static String ExporterSettingsTab_use_java5_syntax;
public static String ExporterSettingsTab_select_dir;
+ public static String ExporterSettingsTab_select_dir2;
public static String ExporterSettingsTab_select_path;
+ public static String ExporterSettingsTab_select_path2;
public static String GeneralExceptionStatusHandler_exception_while_generating_code;
public static String GeneralExceptionStatusHandler_generating_code;
public static String PathHelper_does_not_exist;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2008-10-08 10:57:44 UTC (rev 10736)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2008-10-08 11:06:52 UTC (rev 10737)
@@ -486,7 +486,9 @@
ExporterSettingsTab_template_directory_for=Template directory for
ExporterSettingsTab_use_java5_syntax=Use Java 5 syntax
ExporterSettingsTab_select_dir=Select directory
+ExporterSettingsTab_select_dir2=Select directory from filesystem or workspace.
ExporterSettingsTab_select_path=Select path
+ExporterSettingsTab_select_path2=Select path from filesystem or workspace.
ExporterSettingsTab_use_java5_syntax=Use Java 5 syntax
GeneralExceptionStatusHandler_exception_while_generating_code=Exception while generating code
GeneralExceptionStatusHandler_generating_code=Generating code
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java 2008-10-08 10:57:44 UTC (rev 10736)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/AddPropertyDialog.java 2008-10-08 11:06:52 UTC (rev 10737)
@@ -96,17 +96,23 @@
public void keyPressed(KeyEvent e) {}
public void keyReleased(KeyEvent e) {
- if (e.keyCode == SWT.ARROW_UP || e.keyCode == SWT.ARROW_DOWN) return;
+ if (e.keyCode == SWT.ARROW_UP || e.keyCode == SWT.ARROW_DOWN) {
+ //linux doesn't call selectionChanged event on this events
+ propertyCombo.setSelection(propertyCombo.getSelection(), false);
+ return;
+ }
- for (int i = 0; i < combo.getItemCount(); i++) {
+ for (int i = 0; i < combo.getItemCount(); i++) {
if (combo.getText().equals(combo.getItem(i))){
- combo.select(i);
- propertyCombo.setSelection(propertyCombo.getSelection(), false);
+ if (combo.getSelectionIndex() != i){
+ combo.select(i);
+ propertyCombo.setSelection(propertyCombo.getSelection(), false);
+ }
return;
}
- }
- disposeBrowseButton();
- createTextValueComposite(2);
+ }
+ disposeBrowseButton();
+ createTextValueComposite(2);
}
});
@@ -194,7 +200,7 @@
public void widgetSelected(SelectionEvent e) {
String title = isPath ? HibernateConsoleMessages.ExporterSettingsTab_select_path: HibernateConsoleMessages.ExporterSettingsTab_select_dir;
- String description = title;
+ String description = isPath ? HibernateConsoleMessages.ExporterSettingsTab_select_path2 : HibernateConsoleMessages.ExporterSettingsTab_select_dir2;
MessageDialog dialog = new MessageDialog(getShell(),
title,
@@ -229,7 +235,10 @@
String oldPath = ((Text)value).getText();
if (isPath && oldPath.trim().length() > 0 && strPath != null)
((Text)value).setText( oldPath + File.pathSeparator + strPath );
- else ((Text)value).setText( strPath );
+ else {
+ if (strPath == null) strPath = "";
+ ((Text)value).setText( strPath );
+ }
}
};
}
@@ -313,7 +322,7 @@
}
value = new Combo(parent, SWT.BORDER | SWT.LEAD | SWT.DROP_DOWN | SWT.READ_ONLY);
GridData bgd = new GridData(GridData.GRAB_HORIZONTAL | GridData.FILL_HORIZONTAL);
- bgd.horizontalSpan = 3;
+ bgd.horizontalSpan = 2;
value.setLayoutData(bgd);
((Combo)value).setItems(items);
((Combo)value).addModifyListener( modifyListener );
16 years, 3 months
JBoss Tools SVN: r10736 - trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-08 06:57:44 -0400 (Wed, 08 Oct 2008)
New Revision: 10736
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringFieldEditor.java
Log:
JBIDE-2802
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringFieldEditor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringFieldEditor.java 2008-10-08 10:56:50 UTC (rev 10735)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/editor/StringFieldEditor.java 2008-10-08 10:57:44 UTC (rev 10736)
@@ -312,6 +312,10 @@
String newValue = textField.getText();
if (!newValue.equals(oldValue)) {
fireValueChanged(VALUE, oldValue, newValue);
+ if(textField == null) {
+ //disposed while firing
+ return;
+ }
oldValue = textField.getText();
}
}
16 years, 3 months
JBoss Tools SVN: r10735 - trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-10-08 06:56:50 -0400 (Wed, 08 Oct 2008)
New Revision: 10735
Modified:
trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java
Log:
JBIDE-2834
Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java 2008-10-08 10:13:53 UTC (rev 10734)
+++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/handlers/AddProviderSupport.java 2008-10-08 10:56:50 UTC (rev 10735)
@@ -6,6 +6,7 @@
import org.jboss.tools.common.model.XModelException;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.util.FindObjectHelper;
+import org.jboss.tools.common.model.util.XModelObjectLoaderUtil;
public class AddProviderSupport extends SpecialWizardSupport {
String providerEntity;
@@ -61,7 +62,7 @@
XModelObject provider = getTarget().getModel().createModelObject(providerEntity, p0);
Properties p1 = extractStepData(1);
- XModelObject bus = getTarget().getModel().createModelObject(busEntity, p1);
+ XModelObject bus = XModelObjectLoaderUtil.createValidObject(getTarget().getModel(), busEntity, p1);
provider.addChild(bus);
16 years, 3 months
JBoss Tools SVN: r10734 - trunk/esb/plugins/org.jboss.tools.esb.project.ui.
by jbosstools-commits＠lists.jboss.org
Author: dennyxu
Date: 2008-10-08 06:13:53 -0400 (Wed, 08 Oct 2008)
New Revision: 10734
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml
Log:
JBIDE-2865: revert to previous version because it has already been fixed
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-10-08 09:54:13 UTC (rev 10733)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-10-08 10:13:53 UTC (rev 10734)
@@ -25,7 +25,7 @@
<extension
point="org.eclipse.ui.preferencePages">
<page
- category="org.jboss.ide.eclipse.ui.MainPreferencePage"
+ category="org.jboss.tools.common.model.ui.MainPreferencePage"
class="org.jboss.tools.esb.project.ui.preference.controls.JBossESBRuntimePreferencePage"
id="org.jboss.tools.esb.project.runtime.preference"
name="JBoss ESB Runtimes">
16 years, 3 months