JBoss Tools SVN: r39009 - in branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui: src/org/jboss/tools/jst/web/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-22 13:18:28 -0500 (Wed, 22 Feb 2012)
New Revision: 39009
Modified:
branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java
branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties
branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
Log:
JBIDE-10787
https://issues.jboss.org/browse/JBIDE-10787
Merge to Beta1: Fixes in validation and messages.
Modified: branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2012-02-22 18:12:38 UTC (rev 39008)
+++ branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2012-02-22 18:18:28 UTC (rev 39009)
@@ -130,8 +130,8 @@
</editorType>
</extension>
- <extension point="org.eclipse.ui.newWizards">
- <category name="%NewWizardCat_JBossToolsWeb"
+ <extension point="org.eclipse.ui.newWizards">
+ <category name="%NewWizardCat_JBossToolsWeb"
id="org.jboss.tools.jst.web">
</category>
<wizard
@@ -192,13 +192,13 @@
</selection>
</wizard>
<wizard
- name="New JBoss Datasource"
+ name="JBoss Datasource"
icon="$nl$/images/xstudio/wizards/new_properties_file.gif"
category="org.jboss.tools.jst.web"
class="org.jboss.tools.jst.web.ui.wizards.newfile.NewDSXMLWizard"
id="org.jboss.tools.jst.web.ui.wizards.newfile.NewDSXMLWizard">
<description>
- Creates New DS XML file
+ Creates New JBoss Datasource file
</description>
<selection
class="org.eclipse.core.resources.IResource">
Modified: branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java 2012-02-22 18:12:38 UTC (rev 39008)
+++ branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java 2012-02-22 18:18:28 UTC (rev 39009)
@@ -86,11 +86,19 @@
public static String NewXHTMLTemplatesWizardPage_7;
public static String NewDSXMLWizard_TITLE;
+ public static String NewDSXMLWizard_SUBTITLE;
public static String NewDSXMLWizard_DESCRIPTION;
public static String NewDSXMLWizard_CONNECTION_PROFILE_FIELD;
public static String NewDSXMLWizard_TEMPLATE_FIELD;
public static String NewDSXMLWizard_EDIT_BUTTON;
public static String NewDSXMLWizard_NEW_BUTTON;
+ public static String NewDSXMLWizard_FILE_EXISTS;
+ public static String NewDSXMLWizard_PROJECT_NOT_EXISTS;
+ public static String NewDSXMLWizard_PROJECT_NOT_ACCESSIBLE;
+ public static String NewDSXMLWizard_PROFILE_NOT_SET;
+ public static String NewDSXMLWizard_FOLDER_NOT_SET;
+ public static String NewDSXMLWizard_PARENT_FOLDER_LABEL;
+ public static String NewDSXMLWizard_FILE_NAME_LABEL;
static {
// initialize resource bundle
Modified: branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties
===================================================================
--- branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2012-02-22 18:12:38 UTC (rev 39008)
+++ branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2012-02-22 18:18:28 UTC (rev 39009)
@@ -79,8 +79,16 @@
UI_WIZARD_XHTML_NEW_Description=Create New XHTML Page
NewDSXMLWizard_TITLE=New JBoss Datasource
+NewDSXMLWizard_SUBTITLE=JBoss Datasource
NewDSXMLWizard_DESCRIPTION=Create New JBoss Datasource
NewDSXMLWizard_CONNECTION_PROFILE_FIELD=Connection profile:
NewDSXMLWizard_TEMPLATE_FIELD=Template:
NewDSXMLWizard_EDIT_BUTTON=Edit...
NewDSXMLWizard_NEW_BUTTON=New...
+NewDSXMLWizard_FILE_EXISTS=''{0}'' already exists.
+NewDSXMLWizard_PROJECT_NOT_EXISTS=Selected project does not exist.
+NewDSXMLWizard_PROJECT_NOT_ACCESSIBLE=Selected project is not accessible.
+NewDSXMLWizard_PROFILE_NOT_SET=Select connenction profile.
+NewDSXMLWizard_FOLDER_NOT_SET=Select parent folder.
+NewDSXMLWizard_PARENT_FOLDER_LABEL=Parent fold&er:
+NewDSXMLWizard_FILE_NAME_LABEL=File na&me:
Modified: branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java 2012-02-22 18:12:38 UTC (rev 39008)
+++ branches/jbosstools-3.3.0.Beta1/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java 2012-02-22 18:18:28 UTC (rev 39009)
@@ -123,7 +123,7 @@
public void addPages() {
super.addPages();
mainPage = new WizardNewDSXMLFileCreationPage("newFilePage1", getSelection()); //$NON-NLS-1$
- mainPage.setTitle(Messages.NewDSXMLWizard_TITLE);
+ mainPage.setTitle(Messages.NewDSXMLWizard_SUBTITLE);
mainPage.setDescription(Messages.NewDSXMLWizard_DESCRIPTION);
mainPage.setFileName("ds.xml"); //$NON-NLS-1$
@@ -199,7 +199,7 @@
private IFieldEditor connProfileSelEditor;
private IFieldEditor templateSelEditor;
private IFieldEditor folderEditor;
- private String initialFileName = "";
+ private String initialFileName = ""; //$NON-NLS-1$
private IFieldEditor fileNameEditor;
IDataModel model;
@@ -345,12 +345,12 @@
}
});
- String defaultFolder = "";
+ String defaultFolder = ""; //$NON-NLS-1$
IContainer c = getInitialContainer();
if(c != null) {
defaultFolder = c.getFullPath().toString();
}
- folderEditor = IFieldEditorFactory.INSTANCE.createBrowseWorkspaceFolderEditor("folder", "Parent fold&er:", defaultFolder);
+ folderEditor = IFieldEditorFactory.INSTANCE.createBrowseWorkspaceFolderEditor("folder", Messages.NewDSXMLWizard_PARENT_FOLDER_LABEL, defaultFolder); //$NON-NLS-1$
folderEditor.addPropertyChangeListener(new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
setPageComplete(validatePage());
@@ -358,10 +358,10 @@
});
folderEditor.doFillIntoGrid(q);
- String prefix = toDatasourceName(mainPage.connProfileSelEditor.getValueAsString());
+ String prefix = toDatasourceName(connProfileSelEditor.getValueAsString());
String defaultFileName = prefix + "-ds.xml"; //$NON-NLS-1$
- fileNameEditor = IFieldEditorFactory.INSTANCE.createTextEditor("name", "File na&me:", defaultFileName);
+ fileNameEditor = IFieldEditorFactory.INSTANCE.createTextEditor("name", Messages.NewDSXMLWizard_FILE_NAME_LABEL, defaultFileName); //$NON-NLS-1$
fileNameEditor.doFillIntoGrid(q);
fileNameEditor.addPropertyChangeListener(new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -375,6 +375,10 @@
protected boolean validatePage() {
IPath path = getContainerFullPath();
+ if(path.segmentCount() == 0) {
+ setErrorMessage(Messages.NewDSXMLWizard_FOLDER_NOT_SET);
+ return false;
+ }
String fileName = fileNameEditor.getValueAsString();
IWorkspace workspace = ResourcesPlugin.getWorkspace();
@@ -393,14 +397,22 @@
}
IPath filePath = path.append(fileName);
if(workspace.getRoot().getFile(filePath).exists()) {
- setErrorMessage("'" + fileName + "'" + " already exists.");
+ setErrorMessage(NLS.bind(Messages.NewDSXMLWizard_FILE_EXISTS, fileName));
return false;
}
-
+ IProject selectedProject = workspace.getRoot().getProject(path.segment(0));
+ if(!selectedProject.exists()) {
+ setErrorMessage(Messages.NewDSXMLWizard_PROJECT_NOT_EXISTS);
+ return false;
+ } else if(!selectedProject.isAccessible()) {
+ setErrorMessage(Messages.NewDSXMLWizard_PROJECT_NOT_ACCESSIBLE);
+ return false;
+ }
+
if(connProfileSelEditor != null) {
String p = connProfileSelEditor.getValueAsString();
if(p == null || p.length() == 0) {
- setErrorMessage("Connenction profile must be set.");
+ setErrorMessage(Messages.NewDSXMLWizard_PROFILE_NOT_SET);
return false;
}
}
@@ -411,8 +423,7 @@
IFile newFile = null;
protected IFile createFileHandle(IPath filePath) {
- return IDEWorkbenchPlugin.getPluginWorkspace().getRoot().getFile(
- filePath);
+ return ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
}
public IFile createNewFile() {
if (newFile != null) {
@@ -469,8 +480,7 @@
} catch (InvocationTargetException e) {
// Execution Exceptions are handled above but we may still get
// unexpected runtime errors.
- IDEWorkbenchPlugin.log(getClass(),
- "createNewFile()", e.getTargetException()); //$NON-NLS-1$
+ IDEWorkbenchPlugin.log(getClass(), "createNewFile()", e.getTargetException()); //$NON-NLS-1$
MessageDialog.open(MessageDialog.ERROR,
getContainer().getShell(),
IDEWorkbenchMessages.WizardNewFileCreationPage_internalErrorTitle,
@@ -481,8 +491,6 @@
newFile = newFileHandle;
return newFile;
}
-
-
}
/**
12 years, 4 months
JBoss Tools SVN: r39008 - in trunk/jst/plugins/org.jboss.tools.jst.web.ui: src/org/jboss/tools/jst/web/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-02-22 13:12:38 -0500 (Wed, 22 Feb 2012)
New Revision: 39008
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties
trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
Log:
JBIDE-10787
https://issues.jboss.org/browse/JBIDE-10787
Fixes in validation and messages.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2012-02-22 18:09:16 UTC (rev 39007)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2012-02-22 18:12:38 UTC (rev 39008)
@@ -192,13 +192,13 @@
</selection>
</wizard>
<wizard
- name="New JBoss Datasource"
+ name="JBoss Datasource"
icon="$nl$/images/xstudio/wizards/new_properties_file.gif"
category="org.jboss.tools.jst.web"
class="org.jboss.tools.jst.web.ui.wizards.newfile.NewDSXMLWizard"
id="org.jboss.tools.jst.web.ui.wizards.newfile.NewDSXMLWizard">
<description>
- Creates New DS XML file
+ Creates New JBoss Datasource file
</description>
<selection
class="org.eclipse.core.resources.IResource">
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java 2012-02-22 18:09:16 UTC (rev 39007)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/Messages.java 2012-02-22 18:12:38 UTC (rev 39008)
@@ -86,11 +86,19 @@
public static String NewXHTMLTemplatesWizardPage_7;
public static String NewDSXMLWizard_TITLE;
+ public static String NewDSXMLWizard_SUBTITLE;
public static String NewDSXMLWizard_DESCRIPTION;
public static String NewDSXMLWizard_CONNECTION_PROFILE_FIELD;
public static String NewDSXMLWizard_TEMPLATE_FIELD;
public static String NewDSXMLWizard_EDIT_BUTTON;
public static String NewDSXMLWizard_NEW_BUTTON;
+ public static String NewDSXMLWizard_FILE_EXISTS;
+ public static String NewDSXMLWizard_PROJECT_NOT_EXISTS;
+ public static String NewDSXMLWizard_PROJECT_NOT_ACCESSIBLE;
+ public static String NewDSXMLWizard_PROFILE_NOT_SET;
+ public static String NewDSXMLWizard_FOLDER_NOT_SET;
+ public static String NewDSXMLWizard_PARENT_FOLDER_LABEL;
+ public static String NewDSXMLWizard_FILE_NAME_LABEL;
static {
// initialize resource bundle
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2012-02-22 18:09:16 UTC (rev 39007)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/messages.properties 2012-02-22 18:12:38 UTC (rev 39008)
@@ -79,8 +79,16 @@
UI_WIZARD_XHTML_NEW_Description=Create New XHTML Page
NewDSXMLWizard_TITLE=New JBoss Datasource
+NewDSXMLWizard_SUBTITLE=JBoss Datasource
NewDSXMLWizard_DESCRIPTION=Create New JBoss Datasource
NewDSXMLWizard_CONNECTION_PROFILE_FIELD=Connection profile:
NewDSXMLWizard_TEMPLATE_FIELD=Template:
NewDSXMLWizard_EDIT_BUTTON=Edit...
NewDSXMLWizard_NEW_BUTTON=New...
+NewDSXMLWizard_FILE_EXISTS=''{0}'' already exists.
+NewDSXMLWizard_PROJECT_NOT_EXISTS=Selected project does not exist.
+NewDSXMLWizard_PROJECT_NOT_ACCESSIBLE=Selected project is not accessible.
+NewDSXMLWizard_PROFILE_NOT_SET=Select connenction profile.
+NewDSXMLWizard_FOLDER_NOT_SET=Select parent folder.
+NewDSXMLWizard_PARENT_FOLDER_LABEL=Parent fold&er:
+NewDSXMLWizard_FILE_NAME_LABEL=File na&me:
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java 2012-02-22 18:09:16 UTC (rev 39007)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/newfile/NewDSXMLWizard.java 2012-02-22 18:12:38 UTC (rev 39008)
@@ -123,7 +123,7 @@
public void addPages() {
super.addPages();
mainPage = new WizardNewDSXMLFileCreationPage("newFilePage1", getSelection()); //$NON-NLS-1$
- mainPage.setTitle(Messages.NewDSXMLWizard_TITLE);
+ mainPage.setTitle(Messages.NewDSXMLWizard_SUBTITLE);
mainPage.setDescription(Messages.NewDSXMLWizard_DESCRIPTION);
mainPage.setFileName("ds.xml"); //$NON-NLS-1$
@@ -199,7 +199,7 @@
private IFieldEditor connProfileSelEditor;
private IFieldEditor templateSelEditor;
private IFieldEditor folderEditor;
- private String initialFileName = "";
+ private String initialFileName = ""; //$NON-NLS-1$
private IFieldEditor fileNameEditor;
IDataModel model;
@@ -345,12 +345,12 @@
}
});
- String defaultFolder = "";
+ String defaultFolder = ""; //$NON-NLS-1$
IContainer c = getInitialContainer();
if(c != null) {
defaultFolder = c.getFullPath().toString();
}
- folderEditor = IFieldEditorFactory.INSTANCE.createBrowseWorkspaceFolderEditor("folder", "Parent fold&er:", defaultFolder);
+ folderEditor = IFieldEditorFactory.INSTANCE.createBrowseWorkspaceFolderEditor("folder", Messages.NewDSXMLWizard_PARENT_FOLDER_LABEL, defaultFolder); //$NON-NLS-1$
folderEditor.addPropertyChangeListener(new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
setPageComplete(validatePage());
@@ -358,10 +358,10 @@
});
folderEditor.doFillIntoGrid(q);
- String prefix = toDatasourceName(mainPage.connProfileSelEditor.getValueAsString());
+ String prefix = toDatasourceName(connProfileSelEditor.getValueAsString());
String defaultFileName = prefix + "-ds.xml"; //$NON-NLS-1$
- fileNameEditor = IFieldEditorFactory.INSTANCE.createTextEditor("name", "File na&me:", defaultFileName);
+ fileNameEditor = IFieldEditorFactory.INSTANCE.createTextEditor("name", Messages.NewDSXMLWizard_FILE_NAME_LABEL, defaultFileName); //$NON-NLS-1$
fileNameEditor.doFillIntoGrid(q);
fileNameEditor.addPropertyChangeListener(new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -375,6 +375,10 @@
protected boolean validatePage() {
IPath path = getContainerFullPath();
+ if(path.segmentCount() == 0) {
+ setErrorMessage(Messages.NewDSXMLWizard_FOLDER_NOT_SET);
+ return false;
+ }
String fileName = fileNameEditor.getValueAsString();
IWorkspace workspace = ResourcesPlugin.getWorkspace();
@@ -393,14 +397,22 @@
}
IPath filePath = path.append(fileName);
if(workspace.getRoot().getFile(filePath).exists()) {
- setErrorMessage("'" + fileName + "'" + " already exists.");
+ setErrorMessage(NLS.bind(Messages.NewDSXMLWizard_FILE_EXISTS, fileName));
return false;
}
-
+ IProject selectedProject = workspace.getRoot().getProject(path.segment(0));
+ if(!selectedProject.exists()) {
+ setErrorMessage(Messages.NewDSXMLWizard_PROJECT_NOT_EXISTS);
+ return false;
+ } else if(!selectedProject.isAccessible()) {
+ setErrorMessage(Messages.NewDSXMLWizard_PROJECT_NOT_ACCESSIBLE);
+ return false;
+ }
+
if(connProfileSelEditor != null) {
String p = connProfileSelEditor.getValueAsString();
if(p == null || p.length() == 0) {
- setErrorMessage("Connenction profile must be set.");
+ setErrorMessage(Messages.NewDSXMLWizard_PROFILE_NOT_SET);
return false;
}
}
@@ -411,8 +423,7 @@
IFile newFile = null;
protected IFile createFileHandle(IPath filePath) {
- return IDEWorkbenchPlugin.getPluginWorkspace().getRoot().getFile(
- filePath);
+ return ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
}
public IFile createNewFile() {
if (newFile != null) {
@@ -469,8 +480,7 @@
} catch (InvocationTargetException e) {
// Execution Exceptions are handled above but we may still get
// unexpected runtime errors.
- IDEWorkbenchPlugin.log(getClass(),
- "createNewFile()", e.getTargetException()); //$NON-NLS-1$
+ IDEWorkbenchPlugin.log(getClass(), "createNewFile()", e.getTargetException()); //$NON-NLS-1$
MessageDialog.open(MessageDialog.ERROR,
getContainer().getShell(),
IDEWorkbenchMessages.WizardNewFileCreationPage_internalErrorTitle,
@@ -481,8 +491,6 @@
newFile = newFileHandle;
return newFile;
}
-
-
}
/**
12 years, 4 months
JBoss Tools SVN: r39007 - branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-22 13:09:16 -0500 (Wed, 22 Feb 2012)
New Revision: 39007
Modified:
branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml
Log:
JBIDE-10144 Hibernate Tools: Extend JBoss Perspective
fixed
Modified: branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml 2012-02-22 18:08:06 UTC (rev 39006)
+++ branches/jbosstools-3.3.0.Beta1/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml 2012-02-22 18:09:16 UTC (rev 39007)
@@ -803,6 +803,18 @@
name="Hibernate">
</category>
</extension>
+ <extension
+ point="org.eclipse.ui.perspectiveExtensions">
+ <perspectiveExtension
+ targetID="org.jboss.tools.common.ui.JBossPerspective">
+ <newWizardShortcut
+ id="org.hibernate.eclipse.console.wizards.ConsoleConfigurationCreationWizard">
+ </newWizardShortcut>
+ <perspectiveShortcut
+ id="org.hibernate.eclipse.console.HibernateConsolePerspective">
+ </perspectiveShortcut>
+ </perspectiveExtension>
+ </extension>
<!-- <extension
point="org.eclipse.ui.themes">
<themeElementCategory
12 years, 4 months
JBoss Tools SVN: r39006 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-02-22 13:08:06 -0500 (Wed, 22 Feb 2012)
New Revision: 39006
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml
Log:
JBIDE-10144 Hibernate Tools: Extend JBoss Perspective
fixed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml 2012-02-22 17:19:10 UTC (rev 39005)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/plugin.xml 2012-02-22 18:08:06 UTC (rev 39006)
@@ -803,6 +803,18 @@
name="Hibernate">
</category>
</extension>
+ <extension
+ point="org.eclipse.ui.perspectiveExtensions">
+ <perspectiveExtension
+ targetID="org.jboss.tools.common.ui.JBossPerspective">
+ <newWizardShortcut
+ id="org.hibernate.eclipse.console.wizards.ConsoleConfigurationCreationWizard">
+ </newWizardShortcut>
+ <perspectiveShortcut
+ id="org.hibernate.eclipse.console.HibernateConsolePerspective">
+ </perspectiveShortcut>
+ </perspectiveExtension>
+ </extension>
<!-- <extension
point="org.eclipse.ui.themes">
<themeElementCategory
12 years, 4 months
JBoss Tools SVN: r39003 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-02-22 11:25:43 -0500 (Wed, 22 Feb 2012)
New Revision: 39003
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
Log:
Fixed - JBIDE-11002 - Error in wizard when typing complete existing application name
https://issues.jboss.org/browse/JBIDE-11002
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-22 15:45:21 UTC (rev 39002)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-22 16:25:43 UTC (rev 39003)
@@ -161,7 +161,7 @@
ApplicationConfigurationWizardPageModel.PROPERTY_EXISTING_APPLICATION_NAME).observe(pageModel);
ValueBindingBuilder.bind(existingAppNameTextObservable).to(existingAppNameModelObservable).in(dbc);
UIUtils.focusOnSelection(useExistingAppBtn, existingAppNameText);
- createContentAssist(existingAppNameText);
+ createExistingAppNameContentAssist();
this.browseAppsButton = new Button(existingAppSelectionGroup, SWT.NONE);
browseAppsButton.setText("Browse...");
@@ -181,7 +181,7 @@
return existingAppSelectionGroup;
}
- private void createContentAssist(final Text existingAppNameText) {
+ private void createExistingAppNameContentAssist() {
ControlDecoration dec = new ControlDecoration(existingAppNameText, SWT.TOP | SWT.LEFT);
FieldDecoration contentProposalFieldIndicator = FieldDecorationRegistry.getDefault().getFieldDecoration(
FieldDecorationRegistry.DEC_CONTENT_PROPOSAL);
@@ -638,6 +638,7 @@
public void run() {
loadOpenshiftResources(dbc);
enableApplicationWidgets(pageModel.isUseExistingApplication());
+ createExistingAppNameContentAssist();
// this is needed because of weird issues with UI not
// reacting to model changes while wizard runnable is
// run. We force another update
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-22 15:45:21 UTC (rev 39002)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-22 16:25:43 UTC (rev 39003)
@@ -111,18 +111,21 @@
return existingApplicationName;
}
- public void setExistingApplicationName(String applicationName) {
+ public void setExistingApplicationName(String applicationName) throws OpenShiftException {
firePropertyChange(PROPERTY_EXISTING_APPLICATION_NAME
, existingApplicationName
, this.existingApplicationName = applicationName);
- }
-
- protected void setExistingApplicationName(IApplication application) {
- String applicationName = null;
- if (application != null) {
- applicationName = application.getName();
+ if (applicationName != null) {
+ for (IApplication application : getApplications()) {
+ if (application.getName().equals(applicationName)) {
+ setApplicationName(application.getName());
+ setSelectedCartridge(application.getCartridge());
+ setSelectedEmbeddableCartridges(new HashSet<IEmbeddableCartridge>(
+ application.getEmbeddedCartridges()));
+ }
+ }
}
- setExistingApplicationName(applicationName);
+
}
public void loadExistingApplications() throws OpenShiftException {
@@ -213,11 +216,12 @@
}
public void setExistingApplication(IApplication application) throws OpenShiftException {
- // setUseExistingApplication(application);
- setExistingApplicationName(application);
- setApplicationName(application);
- setSelectedCartridge(application);
- setSelectedEmbeddableCartridges(application);
+ if(application != null) {
+ setExistingApplicationName(application.getName());
+ setApplicationName(application.getName());
+ setSelectedCartridge(application.getCartridge());
+ setSelectedEmbeddableCartridges(new HashSet<IEmbeddableCartridge>(application.getEmbeddedCartridges()));
+ }
wizardModel.setApplication(application);
}
@@ -262,14 +266,6 @@
wizardModel.setSelectedEmbeddableCartridges(selectedEmbeddableCartridges));
}
- protected void setSelectedEmbeddableCartridges(IApplication application) throws OpenShiftException {
- HashSet<IEmbeddableCartridge> selectedEmbeddableCartridges = new HashSet<IEmbeddableCartridge>();
- if (application != null) {
- selectedEmbeddableCartridges.addAll(application.getEmbeddedCartridges());
- }
- setSelectedEmbeddableCartridges(selectedEmbeddableCartridges);
- }
-
public boolean hasApplication(ICartridge cartridge) {
try {
return getUser().hasApplication(cartridge);
12 years, 4 months
JBoss Tools SVN: r39002 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: jgargula
Date: 2012-02-22 10:45:21 -0500 (Wed, 22 Feb 2012)
New Revision: 39002
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
Log:
Added reexpansion of item in Show view menu (because of some bug there is no child nodes after first expansion)
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2012-02-22 15:39:37 UTC (rev 39001)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTEclipseExt.java 2012-02-22 15:45:21 UTC (rev 39002)
@@ -398,8 +398,9 @@
public static void waitForViewInList(SWTBotExt theBot, String theGroupLabel, int counter) {
int itemsCount = theBot.tree().expandNode(theGroupLabel).getItems().length;
while (itemsCount < counter) {
- SWTBotTreeItem[] theItems = theBot.tree().expandNode(theGroupLabel)
- .getItems();
+ SWTBotTreeItem treeItem = theBot.tree().expandNode(theGroupLabel);
+ treeItem.collapse().expand();
+ SWTBotTreeItem[] theItems = treeItem.getItems();
itemsCount = theItems.length;
for (SWTBotTreeItem i : theItems) {
log.info("SWTBotTreeItem = item = " + i);
@@ -454,6 +455,7 @@
while (itGroupsNodes.hasNext()) {
groupTreeItem = groupTreeItem.expandNode(itGroupsNodes.next());
}
+ groupTreeItem.collapse().expand();
groupTreeItem.select(entityLabel);
} else {
tree.select(entityLabel);
12 years, 4 months
JBoss Tools SVN: r39001 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-22 10:39:37 -0500 (Wed, 22 Feb 2012)
New Revision: 39001
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
Log:
[JBIDE-10978] reporting cartridges that were embedded in the application creation wizard (was: no reporting)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-22 15:39:34 UTC (rev 39000)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-22 15:39:37 UTC (rev 39001)
@@ -84,7 +84,6 @@
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils.IWidgetVisitor;
-import org.jboss.tools.openshift.express.internal.ui.wizard.CreationLogDialog.LogEntry;
import com.openshift.express.client.Cartridge;
import com.openshift.express.client.IApplication;
@@ -595,8 +594,7 @@
@Override
public void run() {
- new CreationLogDialog(getShell(), new LogEntry(application.getName(), application.getCreationLog()))
- .open();
+ new CreationLogDialog(getShell(), application).open();
}
});
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2012-02-22 15:39:34 UTC (rev 39000)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2012-02-22 15:39:37 UTC (rev 39001)
@@ -11,6 +11,7 @@
package org.jboss.tools.openshift.express.internal.ui.wizard;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -34,6 +35,9 @@
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
+import com.openshift.express.client.IApplication;
+import com.openshift.express.client.IEmbeddableCartridge;
+
/**
* @author André Dietisheim
*/
@@ -41,15 +45,25 @@
private static final Pattern HTTP_LINK_REGEX = Pattern.compile("(http[^ |\n]+)");
- private LogEntry[] logEntries;
+ private Collection<IEmbeddableCartridge> cartridges;
+ private IApplication application;
private List<LinkSubstring> linkSubstrings;
+
+ public CreationLogDialog(Shell parentShell, Collection<IEmbeddableCartridge> cartridges) {
+ this(parentShell);
+ this.cartridges = cartridges;
+ }
- public CreationLogDialog(Shell parentShell, LogEntry... logEntries) {
+ public CreationLogDialog(Shell parentShell, IApplication application) {
+ this(parentShell);
+ this.application = application;
+ }
+
+ protected CreationLogDialog(Shell parentShell) {
super(parentShell);
- this.logEntries = logEntries;
this.linkSubstrings = new ArrayList<LinkSubstring>();
}
-
+
@Override
protected Control createContents(Composite parent) {
Control control = super.createContents(parent);
@@ -75,11 +89,38 @@
StyledText logText = new StyledText(container, SWT.BORDER | SWT.V_SCROLL);
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(logText);
- writeLogEntries(logEntries, logText);
+ writeLogEntries(createLogEntries(), logText);
logText.addListener(SWT.MouseDown, onLinkClicked(logText));
return container;
}
+ private LogEntry[] createLogEntries() {
+ if (cartridges != null) {
+ return createLogEntries(cartridges);
+ } else {
+ return createLogEntries(application);
+ }
+ }
+
+ private LogEntry[] createLogEntries(Collection<IEmbeddableCartridge> cartridges) {
+ if (cartridges == null
+ || cartridges.isEmpty()) {
+ return new LogEntry[] {};
+ }
+ ArrayList<LogEntry> logEntries = new ArrayList<LogEntry>();
+ for (IEmbeddableCartridge cartridge : cartridges) {
+ logEntries.add(new LogEntry(cartridge.getName(), cartridge.getCreationLog()));
+ }
+ return logEntries.toArray(new LogEntry[cartridges.size()]);
+ }
+
+ private LogEntry[] createLogEntries(IApplication application) {
+ if (application == null) {
+ return new LogEntry[] {};
+ }
+ return new LogEntry[] { new LogEntry(application.getName(), application.getCreationLog()) };
+ }
+
private Listener onLinkClicked(final StyledText logText) {
return new Listener() {
public void handleEvent(Event event) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-02-22 15:39:34 UTC (rev 39000)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-02-22 15:39:37 UTC (rev 39001)
@@ -52,7 +52,6 @@
import org.jboss.tools.common.ui.WizardUtils;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
-import org.jboss.tools.openshift.express.internal.ui.wizard.CreationLogDialog.LogEntry;
import com.openshift.express.client.IApplication;
import com.openshift.express.client.ICartridge;
@@ -375,18 +374,12 @@
if (cartridges.size() == 0) {
return;
}
-
- final ArrayList<LogEntry> logEntries = new ArrayList<LogEntry>();
- for (IEmbeddableCartridge cartridge : cartridges) {
- logEntries.add(new LogEntry(cartridge.getName(), cartridge.getCreationLog()));
- }
getShell().getDisplay().syncExec(new Runnable() {
@Override
public void run() {
- new CreationLogDialog(getShell(),
- logEntries.toArray(new LogEntry[logEntries.size()])).open();
+ new CreationLogDialog(getShell(), cartridges).open();
}
});
@@ -397,8 +390,7 @@
@Override
public void run() {
- new CreationLogDialog(getShell(),
- new LogEntry(application.getName(), application.getCreationLog())).open();
+ new CreationLogDialog(getShell(), application).open();
}
});
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-22 15:39:34 UTC (rev 39000)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-22 15:39:37 UTC (rev 39001)
@@ -226,6 +226,7 @@
List<IEmbeddableCartridge> embeddableCartridges = new ArrayList<IEmbeddableCartridge>();
embeddableCartridges.addAll(selectedCartridges);
application.addEmbbedCartridges(embeddableCartridges);
+ openCreationLogDialog(embeddableCartridges);
}
} catch (OpenShiftEndpointException e) {
// TODO: refresh user
@@ -245,6 +246,20 @@
}
}
+ private void openCreationLogDialog(final List<IEmbeddableCartridge> embeddableCartridges) {
+ if (embeddableCartridges == null
+ || embeddableCartridges.isEmpty()) {
+ return;
+ }
+ getShell().getDisplay().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ new CreationLogDialog(getShell(), embeddableCartridges).open();
+ }
+ });
+ }
+
/**
* A workspace job that will create a new project or enable the selected project to be used with OpenShift.
*/
12 years, 4 months
JBoss Tools SVN: r39000 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-22 10:39:34 -0500 (Wed, 22 Feb 2012)
New Revision: 39000
Modified:
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java
branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
Log:
[JBIDE-10978] reporting cartridges that were embedded in the application creation wizard (was: no reporting)
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-22 15:16:21 UTC (rev 38999)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-22 15:39:34 UTC (rev 39000)
@@ -84,7 +84,6 @@
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils.IWidgetVisitor;
-import org.jboss.tools.openshift.express.internal.ui.wizard.CreationLogDialog.LogEntry;
import com.openshift.express.client.Cartridge;
import com.openshift.express.client.IApplication;
@@ -595,8 +594,7 @@
@Override
public void run() {
- new CreationLogDialog(getShell(), new LogEntry(application.getName(), application.getCreationLog()))
- .open();
+ new CreationLogDialog(getShell(), application).open();
}
});
}
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2012-02-22 15:16:21 UTC (rev 38999)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2012-02-22 15:39:34 UTC (rev 39000)
@@ -11,6 +11,7 @@
package org.jboss.tools.openshift.express.internal.ui.wizard;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -34,6 +35,9 @@
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
+import com.openshift.express.client.IApplication;
+import com.openshift.express.client.IEmbeddableCartridge;
+
/**
* @author André Dietisheim
*/
@@ -41,15 +45,25 @@
private static final Pattern HTTP_LINK_REGEX = Pattern.compile("(http[^ |\n]+)");
- private LogEntry[] logEntries;
+ private Collection<IEmbeddableCartridge> cartridges;
+ private IApplication application;
private List<LinkSubstring> linkSubstrings;
+
+ public CreationLogDialog(Shell parentShell, Collection<IEmbeddableCartridge> cartridges) {
+ this(parentShell);
+ this.cartridges = cartridges;
+ }
- public CreationLogDialog(Shell parentShell, LogEntry... logEntries) {
+ public CreationLogDialog(Shell parentShell, IApplication application) {
+ this(parentShell);
+ this.application = application;
+ }
+
+ protected CreationLogDialog(Shell parentShell) {
super(parentShell);
- this.logEntries = logEntries;
this.linkSubstrings = new ArrayList<LinkSubstring>();
}
-
+
@Override
protected Control createContents(Composite parent) {
Control control = super.createContents(parent);
@@ -75,11 +89,38 @@
StyledText logText = new StyledText(container, SWT.BORDER | SWT.V_SCROLL);
GridDataFactory.fillDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(logText);
- writeLogEntries(logEntries, logText);
+ writeLogEntries(createLogEntries(), logText);
logText.addListener(SWT.MouseDown, onLinkClicked(logText));
return container;
}
+ private LogEntry[] createLogEntries() {
+ if (cartridges != null) {
+ return createLogEntries(cartridges);
+ } else {
+ return createLogEntries(application);
+ }
+ }
+
+ private LogEntry[] createLogEntries(Collection<IEmbeddableCartridge> cartridges) {
+ if (cartridges == null
+ || cartridges.isEmpty()) {
+ return new LogEntry[] {};
+ }
+ ArrayList<LogEntry> logEntries = new ArrayList<LogEntry>();
+ for (IEmbeddableCartridge cartridge : cartridges) {
+ logEntries.add(new LogEntry(cartridge.getName(), cartridge.getCreationLog()));
+ }
+ return logEntries.toArray(new LogEntry[cartridges.size()]);
+ }
+
+ private LogEntry[] createLogEntries(IApplication application) {
+ if (application == null) {
+ return new LogEntry[] {};
+ }
+ return new LogEntry[] { new LogEntry(application.getName(), application.getCreationLog()) };
+ }
+
private Listener onLinkClicked(final StyledText logText) {
return new Listener() {
public void handleEvent(Event event) {
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-02-22 15:16:21 UTC (rev 38999)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2012-02-22 15:39:34 UTC (rev 39000)
@@ -52,7 +52,6 @@
import org.jboss.tools.common.ui.WizardUtils;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
-import org.jboss.tools.openshift.express.internal.ui.wizard.CreationLogDialog.LogEntry;
import com.openshift.express.client.IApplication;
import com.openshift.express.client.ICartridge;
@@ -375,18 +374,12 @@
if (cartridges.size() == 0) {
return;
}
-
- final ArrayList<LogEntry> logEntries = new ArrayList<LogEntry>();
- for (IEmbeddableCartridge cartridge : cartridges) {
- logEntries.add(new LogEntry(cartridge.getName(), cartridge.getCreationLog()));
- }
getShell().getDisplay().syncExec(new Runnable() {
@Override
public void run() {
- new CreationLogDialog(getShell(),
- logEntries.toArray(new LogEntry[logEntries.size()])).open();
+ new CreationLogDialog(getShell(), cartridges).open();
}
});
@@ -397,8 +390,7 @@
@Override
public void run() {
- new CreationLogDialog(getShell(),
- new LogEntry(application.getName(), application.getCreationLog())).open();
+ new CreationLogDialog(getShell(), application).open();
}
});
}
Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-22 15:16:21 UTC (rev 38999)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-22 15:39:34 UTC (rev 39000)
@@ -226,6 +226,7 @@
List<IEmbeddableCartridge> embeddableCartridges = new ArrayList<IEmbeddableCartridge>();
embeddableCartridges.addAll(selectedCartridges);
application.addEmbbedCartridges(embeddableCartridges);
+ openCreationLogDialog(embeddableCartridges);
}
} catch (OpenShiftEndpointException e) {
// TODO: refresh user
@@ -245,6 +246,20 @@
}
}
+ private void openCreationLogDialog(final List<IEmbeddableCartridge> embeddableCartridges) {
+ if (embeddableCartridges == null
+ || embeddableCartridges.isEmpty()) {
+ return;
+ }
+ getShell().getDisplay().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ new CreationLogDialog(getShell(), embeddableCartridges).open();
+ }
+ });
+ }
+
/**
* A workspace job that will create a new project or enable the selected project to be used with OpenShift.
*/
12 years, 4 months