JBoss Tools SVN: r11016 - branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.ext.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-20 15:55:38 -0400 (Mon, 20 Oct 2008)
New Revision: 11016
Modified:
branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.ext/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-2890 fixed
Modified: branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.ext/plugin.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2008-10-20 19:45:28 UTC (rev 11015)
+++ branches/jbosstools-3.0.0.Beta1/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2008-10-20 19:55:38 UTC (rev 11016)
@@ -761,6 +761,12 @@
<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CSS_CLASS" />
</contenttypeidentifier>
+ <contenttypeidentifier
+ id="org.eclipse.wst.html.core.htmlsource">
+ <partitiontype
+ id="org.jboss.tools.common.text.ext.jsp.JSP_CSS_CLASS">
+ </partitiontype>
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
16 years, 2 months
JBoss Tools SVN: r11015 - trunk/common/plugins/org.jboss.tools.common.text.ext.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-20 15:45:28 -0400 (Mon, 20 Oct 2008)
New Revision: 11015
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-2890 fixed
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2008-10-20 19:45:16 UTC (rev 11014)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/plugin.xml 2008-10-20 19:45:28 UTC (rev 11015)
@@ -761,6 +761,9 @@
<contenttypeidentifier id="org.eclipse.jst.jsp.core.jspsource">
<partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CSS_CLASS" />
</contenttypeidentifier>
+ <contenttypeidentifier id="org.eclipse.wst.html.core.htmlsource">
+ <partitiontype id="org.jboss.tools.common.text.ext.jsp.JSP_CSS_CLASS" />
+ </contenttypeidentifier>
</hyperlink>
<hyperlink
16 years, 2 months
JBoss Tools SVN: r11014 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-20 15:45:16 -0400 (Mon, 20 Oct 2008)
New Revision: 11014
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java
Log:
JBIDE-2746 - NPE when workspace root is the changed resource
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java 2008-10-20 19:37:59 UTC (rev 11013)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/eclipse/org/jboss/ide/eclipse/archives/core/WorkspaceChangeListener.java 2008-10-20 19:45:16 UTC (rev 11014)
@@ -69,7 +69,8 @@
// TODO modify to make sure this file is a descriptor in use / registered
if( delta.getResource() != null && delta.getResource().getLocation() != null &&
delta.getResource().getLocation().lastSegment().equals(IArchiveModel.DEFAULT_PACKAGES_FILE)) {
- projects.add(delta.getResource().getProject());
+ if( delta.getResource().getProject() != null )
+ projects.add(delta.getResource().getProject());
}
return true;
}
16 years, 2 months
JBoss Tools SVN: r11013 - in trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui: wizards/pages and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-20 15:37:59 -0400 (Mon, 20 Oct 2008)
New Revision: 11013
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
Log:
JBIDE-2649 - warnings and errors now (again) in title area dialog
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2008-10-20 19:16:34 UTC (rev 11012)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/util/composites/ArchiveSourceDestinationComposite.java 2008-10-20 19:37:59 UTC (rev 11013)
@@ -60,7 +60,7 @@
*/
public class ArchiveSourceDestinationComposite extends Composite {
private Text text;
- private Label pathImage, translatedPath, translatedPathImage, relativeTo;
+ private Label pathImage, relativeTo;
private Button workspaceButton, filesystemButton, variablesButton,
wsRadioButton, fsRadioButton;
@@ -68,8 +68,8 @@
private boolean workspaceRelative = false;
private IArchiveNode destinationNode;
private String path;
- private boolean error;
- private String errorString;
+ private int statusType;
+ private String message;
private double version;
private ArrayList<ChangeListener> listeners = new ArrayList<ChangeListener>();
@@ -87,8 +87,6 @@
protected void createWidgets() {
text = new Text(this, SWT.SINGLE | SWT.BORDER);
pathImage = new Label(this, SWT.NONE);
- translatedPath = new Label(this, SWT.NONE);
- translatedPathImage = new Label(this, SWT.NONE);
workspaceButton = new Button(this, SWT.PUSH);
filesystemButton = new Button(this, SWT.PUSH);
variablesButton = new Button(this, SWT.PUSH);
@@ -106,8 +104,6 @@
fsRadioButton.setLayoutData(createFormData(text,5,null,0,null,0,variablesButton,-5));
wsRadioButton.setLayoutData(createFormData(text,5,null,0,null,0,fsRadioButton,-5));
relativeTo.setLayoutData(createFormData(text,8,null,0,null,0,wsRadioButton,-5));
- translatedPathImage.setLayoutData(createFormData(filesystemButton,5,null,0,0,0,0,20));
- translatedPath.setLayoutData(createFormData(filesystemButton,5,null,0,translatedPathImage,5,100,-5));
}
protected void setWidgetData() {
@@ -118,12 +114,6 @@
fsRadioButton.setText(ArchivesUIMessages.Filesystem2);
relativeTo.setText(ArchivesUIMessages.RelativeTo);
pathImage.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER));
- FontData[] translatedPathData = translatedPath.getFont().getFontData();
- for( int i = 0; i < translatedPathData.length; i++ )
- translatedPathData[i].setHeight(7);
- Font newFont = new Font(Display.getDefault(), translatedPathData);
- translatedPath.setFont(newFont);
- translatedPathImage.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK));
}
protected void addListeners() {
@@ -225,8 +215,8 @@
protected void validateAndUpdateWidgets() {
// clear old status
- error = false;
- errorString = null;
+ statusType = IStatus.OK;
+ message = null;
wsRadioButton.setEnabled(destinationNode == null);
@@ -254,6 +244,8 @@
if( translated == null || !new Path(translated).toFile().exists()) {
translated= NLS.bind(ArchivesUIMessages.PathDoesNotExistInFilesystem,translated);
img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
+ statusType = IStatus.WARNING;
+ message = translated;
} else {
img = null;
}
@@ -262,14 +254,17 @@
translated = ce.getMessage();
if( ce.getStatus().getSeverity() == IStatus.ERROR) {
img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
- error = true;
- errorString = ce.getMessage();
- } else if( ce.getStatus().getSeverity() == IStatus.WARNING)
+ statusType = IStatus.ERROR;
+ message = ce.getMessage();
+ } else if( ce.getStatus().getSeverity() == IStatus.WARNING) {
img = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
+ statusType = IStatus.WARNING;
+ message = ce.getMessage();
+ }
}
- translatedPathImage.setImage(img);
- translatedPath.setText(translated);
+// translatedPathImage.setImage(img);
+// translatedPath.setText(translated);
fireChange();
}
@@ -354,13 +349,17 @@
}
public boolean isValid() {
- return !error;
+ return statusType != IStatus.ERROR;
}
- public String getErrorMessage() {
- return errorString;
+ public String getMessage() {
+ return message;
}
+ public int getStatusType() {
+ return statusType;
+ }
+
public boolean isWorkspaceRelative() {
return workspaceRelative;
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java 2008-10-20 19:16:34 UTC (rev 11012)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java 2008-10-20 19:37:59 UTC (rev 11013)
@@ -16,6 +16,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
@@ -30,7 +31,6 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
-import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.ArchiveNodeFactory;
import org.jboss.ide.eclipse.archives.core.model.ArchivesModel;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
@@ -176,12 +176,15 @@
}
private boolean validate () {
- String errorMessage = null;
- if (packageNameText.getText() == null || packageNameText.getText().length() == 0)
- errorMessage = ArchivesUIMessages.PackageInfoWizardPage_error_noPackageName;
- else if( !destinationComposite.isValid() )
- errorMessage = destinationComposite.getErrorMessage();
- else if( destinationComposite.getDestinationNode() != null ) {
+ String message = null;
+ int messageType = IStatus.OK;
+ if (packageNameText.getText() == null || packageNameText.getText().length() == 0) {
+ message = ArchivesUIMessages.PackageInfoWizardPage_error_noPackageName;
+ messageType = IStatus.ERROR;
+ } else if( destinationComposite.getMessage() != null ) {
+ message = destinationComposite.getMessage();
+ messageType = destinationComposite.getStatusType();
+ } else if( destinationComposite.getDestinationNode() != null ) {
IArchiveNode parentNode = destinationComposite.getDestinationNode();
// verify no child has the same name
IArchiveNode subPackages[] = parentNode.getChildren(IArchiveNode.TYPE_ARCHIVE);
@@ -189,9 +192,10 @@
IArchive subPackage = (IArchive) subPackages[i];
if (subPackage.getName().equals(packageNameText.getText())
&& (!subPackage.equals(this.archive))) {
- errorMessage = ArchivesUIMessages.bind(
+ message = ArchivesUIMessages.bind(
ArchivesUIMessages.PackageInfoWizardPage_error_packageAlreadyExists,
packageNameText.getText());
+ messageType = IStatus.ERROR;
}
}
} else if( destinationComposite.getPath() != null ) {
@@ -213,18 +217,19 @@
if (pkg.getName().equals(packageNameText.getText())
&& (PathUtils.getGlobalLocation(pkg)!= null && PathUtils.getGlobalLocation(pkg).equals(destinationLocation))
&& (!pkg.equals(this.archive))) {
- errorMessage = ArchivesUIMessages.bind(
+ message = ArchivesUIMessages.bind(
ArchivesUIMessages.PackageInfoWizardPage_error_packageAlreadyExists, packageNameText.getText());
+ messageType = IStatus.ERROR;
}
}
}
} else {
- errorMessage = (ArchivesUIMessages.PackageInfoWizardPage_error_noDestination);
+ message = (ArchivesUIMessages.PackageInfoWizardPage_error_noDestination);
}
- setErrorMessage(errorMessage);
- setPageComplete(errorMessage == null);
- return errorMessage == null;
+ setPageComplete(message == null || messageType <= IStatus.WARNING);
+ setMessage(message, messageType);
+ return messageType <= IStatus.WARNING;
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2008-10-20 19:16:34 UTC (rev 11012)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java 2008-10-20 19:37:59 UTC (rev 11013)
@@ -11,12 +11,10 @@
package org.jboss.ide.eclipse.archives.ui.wizards.pages;
import java.util.ArrayList;
-import java.util.Arrays;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.SWT;
@@ -38,12 +36,9 @@
import org.eclipse.swt.widgets.Text;
import org.jboss.ide.eclipse.archives.core.ArchivesCore;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory;
-import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.model.IArchiveFileSet;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
import org.jboss.ide.eclipse.archives.core.model.DirectoryScannerFactory.DirectoryScannerExtension;
-import org.jboss.ide.eclipse.archives.core.util.ModelUtil;
-import org.jboss.ide.eclipse.archives.core.util.PathUtils;
import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages;
import org.jboss.ide.eclipse.archives.ui.util.composites.ArchiveFilesetDestinationComposite;
@@ -254,12 +249,12 @@
}
private boolean validate () {
- String errorMessage = null;
- if( !srcDestComposite.isValid() )
- errorMessage = srcDestComposite.getErrorMessage();
- setErrorMessage(errorMessage);
- setPageComplete(errorMessage == null);
- return errorMessage == null;
+ String message = srcDestComposite.getMessage();
+ int messageType = srcDestComposite.getStatusType();
+
+ setMessage(message, messageType);
+ setPageComplete(messageType <= IStatus.WARNING);
+ return messageType <= IStatus.WARNING;
}
16 years, 2 months
JBoss Tools SVN: r11012 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-20 15:16:34 -0400 (Mon, 20 Oct 2008)
New Revision: 11012
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java
Log:
JBIDE-2844
Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java 2008-10-20 19:09:37 UTC (rev 11011)
+++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java 2008-10-20 19:16:34 UTC (rev 11012)
@@ -287,8 +287,10 @@
public void addFilesetAsChild(IArchiveFileSet fs) {
FileWrapper[] files = fs.findMatchingPaths(); // file-system based source paths
- for( int i = 0; i < files.length; i++ ) {
- addFilesetPathAsChild(fs, files[i]);
+ if( files != null ) {
+ for( int i = 0; i < files.length; i++ ) {
+ addFilesetPathAsChild(fs, files[i]);
+ }
}
}
16 years, 2 months
JBoss Tools SVN: r11011 - in trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui: src/main/org/jboss/ide/eclipse/archives/ui and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-20 15:09:37 -0400 (Mon, 20 Oct 2008)
New Revision: 11011
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ExtensionManager.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/PrefsInitializer.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java
Log:
JBIDE-2826
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2008-10-20 18:35:49 UTC (rev 11010)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2008-10-20 19:09:37 UTC (rev 11011)
@@ -54,7 +54,7 @@
<page
class="org.jboss.ide.eclipse.archives.ui.preferences.MainPreferencePage"
id="org.jboss.ide.eclipse.archives.ui.archivesPreferencePage"
- name="Packaging Archives"/>
+ name="Project Archives"/>
</extension>
@@ -63,12 +63,12 @@
<page
class="org.jboss.ide.eclipse.archives.ui.preferences.MainPreferencePage"
id="org.jboss.ide.eclipse.archives.ui.projectProperties"
- name="Packaging Archives"
+ name="Project Archives"
objectClass="org.eclipse.core.resources.IProject"/>
<page
class="org.jboss.ide.eclipse.archives.ui.preferences.MainPreferencePage"
id="org.jboss.ide.eclipse.archives.ui.projectProperties2"
- name="Packaging Archives"
+ name="Project Archives"
objectClass="org.eclipse.jdt.core.IJavaProject"/>
</extension>
<extension
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-10-20 18:35:49 UTC (rev 11010)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-10-20 19:09:37 UTC (rev 11011)
@@ -127,9 +127,10 @@
public static String PreferencePageTitle;
public static String ProjectSpecificSettings;
public static String CorePreferences;
+ public static String ProjectExplorerPreferences;
public static String EnableIncrementalBuilder;
public static String ShowBuildErrorDialog;
-
+ public static String EnableNodeAlways;
public static String ProjectPackagesView;
public static String ShowFullOutputPath;
public static String ShowFullRootDirectory;
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-10-20 18:35:49 UTC (rev 11010)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-10-20 19:09:37 UTC (rev 11011)
@@ -108,12 +108,14 @@
PackageNodeDestinationDialog_folderLabel=folder
PackageNodeDestinationDialog_title=Select a destination
-PreferencePageTitle=Packaging Archives
+PreferencePageTitle=Project Archives
ProjectSpecificSettings=Enable Project Specific Settings
CorePreferences=Core Preferences
+ProjectExplorerPreferences=Core Preferences
EnableIncrementalBuilder=Enable incremental builder
ShowBuildErrorDialog=Show build error dialog
-ProjectPackagesView=Project Packages View
+EnableNodeAlways=Show node in all projects
+ProjectPackagesView=Project Archives View
ShowFullOutputPath=Show full output path next to packages.
ShowFullRootDirectory=Show the full root directory of filesets.
ShowRootProject=Show project at the root
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ExtensionManager.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ExtensionManager.java 2008-10-20 18:35:49 UTC (rev 11010)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ExtensionManager.java 2008-10-20 19:09:37 UTC (rev 11011)
@@ -50,11 +50,13 @@
public static NodeContribution[] findNodePopupMenuContributions () {
ArrayList<NodeContribution> contributions = new ArrayList<NodeContribution>();
IExtension[] extensions = findExtension(NODE_POPUP_MENUS_EXTENSION_ID);
-
+ NodeContribution tmp;
for (int i = 0; i < extensions.length; i++) {
IConfigurationElement[] elements = extensions[i].getConfigurationElements();
for (int j = 0; j < elements.length; j++) {
- contributions.add(new NodeContribution(elements[j]));
+ tmp = new NodeContribution(elements[j]);
+ if( tmp.getActionDelegate() != null )
+ contributions.add(tmp);
}
}
@@ -64,11 +66,13 @@
public static NewArchiveAction[] findNewArchiveActions () {
ArrayList<NewArchiveAction> contributions = new ArrayList<NewArchiveAction>();
IExtension[] extensions = findExtension(NEW_PACKAGE_ACTIONS_EXTENSION_ID);
-
+ NewArchiveAction tmp;
for (int i = 0; i < extensions.length; i++) {
IConfigurationElement[] elements = extensions[i].getConfigurationElements();
for (int j = 0; j < elements.length; j++) {
- contributions.add(new NewArchiveAction(elements[j]));
+ tmp = new NewArchiveAction(elements[j]);
+ if( tmp.getAction() != null)
+ contributions.add(tmp);
}
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/PrefsInitializer.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/PrefsInitializer.java 2008-10-20 18:35:49 UTC (rev 11010)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/PrefsInitializer.java 2008-10-20 19:09:37 UTC (rev 11011)
@@ -32,6 +32,7 @@
public static final String PREF_SHOW_PROJECT_ROOT = "showProjectRoot";//$NON-NLS-1$
public static final String PREF_SHOW_ALL_PROJECTS = "showAllProjects";//$NON-NLS-1$
public static final String PREF_SHOW_BUILD_ERROR_DIALOG = "showBuildErrorDialog";//$NON-NLS-1$
+ public static final String PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE = "alwaysShowProjectExplorerNode";//$NON-NLS-1$
public static final ArrayList<IArchivesPreferenceListener> listeners = new ArrayList<IArchivesPreferenceListener>();
public static interface IArchivesPreferenceListener {
@@ -45,6 +46,7 @@
prefs.putBoolean(PREF_SHOW_PROJECT_ROOT, true);
prefs.putBoolean(PREF_SHOW_ALL_PROJECTS, false);
prefs.putBoolean(PREF_SHOW_BUILD_ERROR_DIALOG, true);
+ prefs.putBoolean(PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE, false);
try {
prefs.flush();
} catch (org.osgi.service.prefs.BackingStoreException e) {
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java 2008-10-20 18:35:49 UTC (rev 11010)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/preferences/MainPreferencePage.java 2008-10-20 19:09:37 UTC (rev 11011)
@@ -43,7 +43,8 @@
private Button showPackageOutputPath, showFullFilesetRootDir;
private Button showProjectRoot, showAllProjects;
private Button automaticBuilder, showErrorDialog, overrideButton;
- private Group corePrefGroup, viewPrefGroup;
+ private Button showNodeOnAllProjects;
+ private Group corePrefGroup, viewPrefGroup, packageExplorerGroup;
private Composite overrideComp;
@@ -60,6 +61,7 @@
createOverridePrefs(main);
createCorePrefs(main);
createViewPrefs(main);
+ createProjectExplorerPrefs(main);
fillValues();
return main;
}
@@ -136,7 +138,17 @@
showErrorDialog = new Button(corePrefGroup, SWT.CHECK);
showErrorDialog.setText(ArchivesUIMessages.ShowBuildErrorDialog);
}
+
+ protected void createProjectExplorerPrefs(Composite main) {
+ packageExplorerGroup = new Group(main, SWT.NONE);
+ packageExplorerGroup.setText(ArchivesUIMessages.ProjectExplorerPreferences);
+ packageExplorerGroup.setLayout(new GridLayout(1, false));
+ packageExplorerGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ showNodeOnAllProjects = new Button(packageExplorerGroup, SWT.CHECK);
+ showNodeOnAllProjects.setText(ArchivesUIMessages.EnableNodeAlways);
+ }
+
protected void createViewPrefs(Composite main) {
viewPrefGroup = new Group(main, SWT.NONE);
@@ -185,6 +197,7 @@
showFullFilesetRootDir.setSelection(true);
showProjectRoot.setSelection(true);
showAllProjects.setSelection(false);
+ showNodeOnAllProjects.setSelection(false);
if( getResourceLocationIfExists() != null ) {
overrideButton.setSelection(false);
setWidgetsEnabled(overrideButton.getSelection());
@@ -203,6 +216,7 @@
PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_FULL_FILESET_ROOT_DIR, showFullFilesetRootDir.getSelection(), getElement());
PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_PROJECT_ROOT, showProjectRoot.getSelection(), getElement());
PrefsInitializer.setBoolean(PrefsInitializer.PREF_SHOW_ALL_PROJECTS, showAllProjects.getSelection(), getElement());
+ PrefsInitializer.setBoolean(PrefsInitializer.PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE, showNodeOnAllProjects.getSelection(), getElement());
return true;
}
}
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java 2008-10-20 18:35:49 UTC (rev 11010)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/providers/ArchivesRootBridgeContentProvider.java 2008-10-20 19:09:37 UTC (rev 11011)
@@ -13,6 +13,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
+import org.jboss.ide.eclipse.archives.core.model.ArchivesModel;
import org.jboss.ide.eclipse.archives.ui.PrefsInitializer;
import org.jboss.ide.eclipse.archives.ui.PrefsInitializer.IArchivesPreferenceListener;
import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProviderDelegate.WrappedProject;
@@ -36,7 +37,10 @@
public Object[] getChildren(Object parentElement) {
if( parentElement instanceof IProject) {
if( ((IProject)parentElement).isOpen())
- return new Object[] { new WrappedProject((IProject)parentElement, WrappedProject.CATEGORY) };
+ if( PrefsInitializer.getBoolean(PrefsInitializer.PREF_ALWAYS_SHOW_PROJECT_EXPLORER_NODE) ||
+ ArchivesModel.instance().canReregister(((IProject)parentElement).getLocation())) {
+ return new Object[] { new WrappedProject((IProject)parentElement, WrappedProject.CATEGORY) };
+ }
return new Object[]{};
}
return delegate.getChildren(parentElement);
16 years, 2 months
JBoss Tools SVN: r11010 - in trunk: jst/plugins/org.jboss.tools.jst.jsp/schema and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-10-20 14:35:49 -0400 (Mon, 20 Oct 2008)
New Revision: 11010
Added:
trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/
trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visual_editors.exsd
trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visulaEditorImplementations.exsd
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
Log:
=JBIDE-2674, visual editor implementations extension point was added
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2008-10-20 18:24:50 UTC (rev 11009)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/plugin.xml 2008-10-20 18:35:49 UTC (rev 11010)
@@ -3,7 +3,9 @@
<plugin>
<extension-point id="occurrenceStructureProviders"
- name="%occurrenceStructureProvidersExtensionPoint" />
+ name="%occurrenceStructureProvidersExtensionPoint" />
+ <extension-point id="visulaEditorImplementations" name="Visual Editor Implementations" schema="schema/visulaEditorImplementations.exsd">
+ </extension-point>
<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
<sourceViewerConfiguration
@@ -401,4 +403,4 @@
</extension>
-</plugin>
\ No newline at end of file
+</plugin>
Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visual_editors.exsd
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visual_editors.exsd (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visual_editors.exsd 2008-10-20 18:35:49 UTC (rev 11010)
@@ -0,0 +1,84 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.jboss.tools.jst.jsp" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appinfo>
+ <meta.schema plugin="org.jboss.tools.jst.jsp" id="visual_editors" name="VisualEditors"/>
+ </appinfo>
+ <documentation>
+ [Enter description of this extension point.]
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
+ <complexType>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="since"/>
+ </appinfo>
+ <documentation>
+ [Enter the first release in which this extension point appears.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="examples"/>
+ </appinfo>
+ <documentation>
+ [Enter extension point usage example here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="apiinfo"/>
+ </appinfo>
+ <documentation>
+ [Enter API information here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="implementation"/>
+ </appinfo>
+ <documentation>
+ [Enter information about supplied implementation of this extension point.]
+ </documentation>
+ </annotation>
+
+
+</schema>
Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visulaEditorImplementations.exsd
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visulaEditorImplementations.exsd (rev 0)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/schema/visulaEditorImplementations.exsd 2008-10-20 18:35:49 UTC (rev 11010)
@@ -0,0 +1,115 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.jboss.tools.jst.jsp" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appinfo>
+ <meta.schema plugin="org.jboss.tools.jst.jsp" id="visulaEditorImplementations" name="Visual Editor Implementations"/>
+ </appinfo>
+ <documentation>
+ [Enter description of this extension point.]
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appinfo>
+ <meta.element />
+ </appinfo>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="visualEditorImplementation"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute kind="identifier"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="visualEditorImplementation">
+ <complexType>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+ The name of visual editor implementation
+ </documentation>
+ <appinfo>
+ <meta.attribute translatable="true"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ <attribute name="class" type="string" use="required">
+ <annotation>
+ <documentation>
+ Class which implement visual editor factory
+ </documentation>
+ <appinfo>
+ <meta.attribute kind="java" basedOn=":org.jboss.tools.jst.jsp.editor.IVisualEditorFactory"/>
+ </appinfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="since"/>
+ </appinfo>
+ <documentation>
+ [Enter the first release in which this extension point appears.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="examples"/>
+ </appinfo>
+ <documentation>
+ [Enter extension point usage example here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="apiinfo"/>
+ </appinfo>
+ <documentation>
+ [Enter API information here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appinfo>
+ <meta.section type="implementation"/>
+ </appinfo>
+ <documentation>
+ [Enter information about supplied implementation of this extension point.]
+ </documentation>
+ </annotation>
+
+
+</schema>
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2008-10-20 18:24:50 UTC (rev 11009)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditor.java 2008-10-20 18:35:49 UTC (rev 11010)
@@ -19,6 +19,8 @@
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.core.runtime.IExtension;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Platform;
@@ -80,7 +82,6 @@
import org.jboss.tools.jst.jsp.preferences.VpePreference;
import org.jboss.tools.jst.web.tld.VpeTaglibManager;
import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider;
-import org.osgi.framework.Bundle;
// Fix for EXIN-232: The IMultiPageEditor interface implementation is added.
public class JSPMultiPageEditor extends JSPMultiPageEditorPart implements
@@ -101,8 +102,12 @@
private static final String PREVIEW_TAB="Preview"; //$NON-NLS-1$
//visual tab
private static final String VISUAL_SOURCE_TAB="Visual/Source"; //$NON-NLS-1$
+
+ private static final String VPE_VISUAL_EDITOR_IMPL_ID="org.jboss.tools.vpe.org.jboss.tools.vpe.editor.VpeEditorPartFactory"; //$NON-NLS-1$
//source tab
private static final String SOURCE_TAB="Source"; //$NON-NLS-1$
+
+ private static final String VISUAL_EDITOR_IMPL_EXTENSION_POINT_NAME="visulaEditorImplementations"; //$NON-NLS-1$
private IVisualEditor visualEditor;
@@ -137,19 +142,32 @@
static IVisualEditorFactory visualEditorFactory;
static {
+ //Fix For JBIDE-2674
try {
- Bundle b = Platform.getBundle("org.jboss.tools.vpe"); //$NON-NLS-1$
- //FIX for JBIDE-2248
- if(b!=null) {
- Class cls = b
- .loadClass("org.jboss.tools.vpe.editor.VpeEditorPartFactory"); //$NON-NLS-1$
- visualEditorFactory = (IVisualEditorFactory) cls.newInstance();
+ IExtension visualEditorExtension = Platform.getExtensionRegistry()
+ .getExtension(JspEditorPlugin.PLUGIN_ID,
+ VISUAL_EDITOR_IMPL_EXTENSION_POINT_NAME,
+ VPE_VISUAL_EDITOR_IMPL_ID);
+ if (visualEditorExtension != null) {
+ IConfigurationElement[] configurationElements = visualEditorExtension
+ .getConfigurationElements();
+ if (configurationElements != null
+ && configurationElements.length == 1) {
+ visualEditorFactory = (IVisualEditorFactory) configurationElements[0]
+ .createExecutableExtension("class"); //$NON-NLS-1$
+ } else {
+ JspEditorPlugin
+ .getPluginLog()
+ .logError(
+ "Visual Editor Extension Point not configured correctly"); //$NON-NLS-1$
+ }
} else {
- JspEditorPlugin.getPluginLog().logError("Plugin org.jboss.tools.vpe not available," + //$NON-NLS-1$
- " visual page editor will be not available"); //$NON-NLS-1$
+ JspEditorPlugin.getPluginLog().logError(
+ "Visual Editor Implementation not available"); //$NON-NLS-1$
}
- } catch (Exception e) {
- JspEditorPlugin.getPluginLog().logError("Error in loading visual editor factory", e); //$NON-NLS-1$
+ } catch (CoreException e) {
+ JspEditorPlugin.getPluginLog().logError(
+ "Visual Editor Implementation not available" + e); //$NON-NLS-1$
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2008-10-20 18:24:50 UTC (rev 11009)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/plugin.xml 2008-10-20 18:35:49 UTC (rev 11010)
@@ -71,4 +71,8 @@
contextId="org.jboss.tools.vpe.editorContext"
sequence="M1+M2+Tab"/>
</extension>
+ <extension
+ point="org.jboss.tools.jst.jsp.visulaEditorImplementations" id="org.jboss.tools.vpe.editor.VpeEditorPartFactory">
+ <visualEditorImplementation name="XulRunner Visual Editor" class="org.jboss.tools.vpe.editor.VpeEditorPartFactory"/>
+ </extension>
</plugin>
16 years, 2 months
JBoss Tools SVN: r11009 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-20 14:24:50 -0400 (Mon, 20 Oct 2008)
New Revision: 11009
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties
Log:
JBIDE-2932 - error dialog shows node
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java 2008-10-20 18:09:23 UTC (rev 11008)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIBuildListener.java 2008-10-20 18:24:50 UTC (rev 11009)
@@ -15,6 +15,7 @@
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.accessibility.AccessibleAdapter;
import org.eclipse.swt.accessibility.AccessibleEvent;
@@ -40,7 +41,7 @@
*/
public class ArchivesUIBuildListener extends AbstractBuildListener {
- public void error(IArchiveNode node, final IStatus[] multi) {
+ public void error(final IArchiveNode node, final IStatus[] multi) {
final MultiStatus ms = new MultiStatus(ArchivesCore.PLUGIN_ID, 0, ArchivesUIMessages.BuildError, null);
for( int i = 0; i < multi.length; i++ ) {
ms.add(multi[i]);
@@ -48,7 +49,10 @@
if( PrefsInitializer.getBoolean(PrefsInitializer.PREF_SHOW_BUILD_ERROR_DIALOG)) {
Display.getDefault().asyncExec(new Runnable() {
public void run() {
- ErrorDialog ed = new ErrorDialogWithPreference(new Shell(), ArchivesUIMessages.BuildError, ArchivesUIMessages.BuildError, ms, IStatus.ERROR );
+ ErrorDialog ed = new ErrorDialogWithPreference(
+ new Shell(), ArchivesUIMessages.BuildError,
+ NLS.bind(ArchivesUIMessages.BuildError2, node.toString()),
+ ms, IStatus.ERROR );
ed.open();
}
} );
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-10-20 18:09:23 UTC (rev 11008)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.java 2008-10-20 18:24:50 UTC (rev 11009)
@@ -14,6 +14,7 @@
public class ArchivesUIMessages extends NLS {
public static String BuildError;
+ public static String BuildError2;
public static String DoNotShowThisAgain;
public static String BuildArchivesNode;
public static String SelectAProject;
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-10-20 18:09:23 UTC (rev 11008)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/ArchivesUIMessages.properties 2008-10-20 18:24:50 UTC (rev 11009)
@@ -1,4 +1,5 @@
BuildError=Error building project archives
+BuildError2=Error building project archives node {0}
DoNotShowThisAgain=Do not show this message again.
BuildArchivesNode=Build Archive Node
SelectAProject=Please select a project
16 years, 2 months
JBoss Tools SVN: r11008 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-20 14:09:23 -0400 (Mon, 20 Oct 2008)
New Revision: 11008
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
Log:
JBIDE-2852 - line numbers have changed but I've tried to NPE-proof it.
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-10-20 17:11:39 UTC (rev 11007)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/util/internal/ModelTruezipBridge.java 2008-10-20 18:09:23 UTC (rev 11008)
@@ -232,11 +232,14 @@
private static File[] getFiles(FileWrapper[] inputFiles, IArchiveFileSet fs ) {
String filesetRelative;
File fsFile = getFile(fs);
- if( fsFile == null )
+ if( fs == null || fsFile == null )
return new File[]{};
- File[] returnFiles = new File[inputFiles.length];
+ ArrayList<File> returnFiles = new ArrayList<File>();
for( int i = 0; i < inputFiles.length; i++ ) {
+ if( inputFiles[i] == null )
+ continue;
+
if( fs.isFlattened() )
filesetRelative = inputFiles[i].getOutputName();
else
@@ -251,9 +254,9 @@
} else {
parentFile = fsFile;
}
- returnFiles[i] = new File(parentFile, new Path(filesetRelative).lastSegment(), ArchiveDetector.DEFAULT);
+ returnFiles.add(new File(parentFile, new Path(filesetRelative).lastSegment(), ArchiveDetector.DEFAULT));
}
- return returnFiles;
+ return (File[]) returnFiles.toArray(new File[returnFiles.size()]);
}
16 years, 2 months
JBoss Tools SVN: r11007 - trunk/birt/docs/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2008-10-20 13:11:39 -0400 (Mon, 20 Oct 2008)
New Revision: 11007
Modified:
trunk/birt/docs/en/modules/birt_designer.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-388 - birt designer features and UI updated
Modified: trunk/birt/docs/en/modules/birt_designer.xml
===================================================================
--- trunk/birt/docs/en/modules/birt_designer.xml 2008-10-20 15:55:25 UTC (rev 11006)
+++ trunk/birt/docs/en/modules/birt_designer.xml 2008-10-20 17:11:39 UTC (rev 11007)
@@ -29,13 +29,13 @@
<para>The next part of user interface is different <property>Views</property> that can be arranged around the Layout Editor area the way you like:</para>
<itemizedlist>
- <listitem><para><emphasis role="bold">Palette</emphasis> - BIRT View that shows the standard report items you can add to your report using drag and drop.</para></listitem>
- <listitem><para><emphasis role="bold">Outline</emphasis> - BIRT View that shows the structure of your report as a tree view.</para></listitem>
- <listitem><para><emphasis role="bold">Navigator</emphasis> - Standard Eclipse view that shows your projects, and the reports within your projects.</para></listitem>
- <listitem><para><emphasis role="bold">Data Explorer</emphasis> - BIRT View that shows your data sources (connections), data sets (queries) and report parameters. You also use this view to add data set columns to your report layout.</para></listitem>
- <listitem><para><emphasis role="bold">Property Editor</emphasis> - BIRT View that displays properties for many report items. It has tabs and groupings that organize properties into categories.</para></listitem>
- <listitem><para><emphasis role="bold">Properties View</emphasis> - Standard Eclipse view that shows all properties for a report item as a simple list. This view is optional, and we will not use it in this tutorial.</para></listitem>
- <listitem><para><emphasis role="bold">Library Explorer View</emphasis> - BIRT allows the reuse of report objects, such as tables, data sources and styles. Objects created for reuse are stored in a library file. The Library Explorer will display Libraries that exist in the resource folder. Developed libraries can be added to the resource folder by selecting File→Publish Library to Resource Folder or by right clicking in Library Explorer and selecting add. The resource folder location can be configured. </para></listitem>
+ <listitem><para><emphasis role="bold">Palette</emphasis> - shows the standard report items you can add to your report using drag and drop.</para></listitem>
+ <listitem><para><emphasis role="bold">Outline</emphasis> - shows the structure of your report as a tree view.</para></listitem>
+ <listitem><para><emphasis role="bold">Navigator</emphasis> - shows your projects and reports within the projects.</para></listitem>
+ <listitem><para><emphasis role="bold">Data Explorer</emphasis> - shows your data sources, data sets and report parameters. You also can use this view to add data set columns to your report layout.</para></listitem>
+ <listitem><para><emphasis role="bold">Property Editor</emphasis> - displays properties for many report items.</para></listitem>
+ <listitem><para><emphasis role="bold">Properties View</emphasis> - shows all properties for a report item as a simple list.</para></listitem>
+ <listitem><para><emphasis role="bold">Library Explorer View</emphasis> - allows the reuse of report objects, such as tables, data sources and styles. Objects created for reuse are stored in a library file. The Library Explorer will display Libraries that exist in the Resource folder. Developed libraries can be added to the resource folder by selecting <emphasis>File→Publish Library in Resource Folder</emphasis>. The resource folder location can be configured. </para></listitem>
@@ -60,23 +60,12 @@
<listitem><para><emphasis role="bold">Report Preview</emphasis> - Report Preview is used to test your newly created report with some real data.</para></listitem>
<listitem><para><emphasis role="bold">Chart Builder</emphasis> - using the Chart Builder you can add any charts to the design of your report. Just select a chart type, then data and, finally, format the chart.</para></listitem>
<listitem><para><emphasis role="bold">Expression Builder </emphasis> - expressions are simple scripts that return a value. They are used to assign data values to report elements, build image locations, hyperlinks, parameter default values etc.</para></listitem>
- <listitem><para><emphasis role="bold">Cheat Sheets</emphasis> - Cheat sheets are small pices of useful dosumentation that lead you through a report creation process. Just select when you need and then follow the instructions.</para></listitem>
+ <listitem><para><emphasis role="bold">Cheat Sheets</emphasis> - Cheat sheets are small pices of useful documentation that lead you through a report creation process. Just select what you need and then follow the instructions.</para></listitem>
<listitem><para><emphasis role="bold">Outline</emphasis> - this view provides a compact overview of the entire report structure.</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>
- <listitem><para> Add a title to the top of the report. </para></listitem>
- <listitem><para> Add some color to enhance the column headings. </para></listitem>
- <listitem><para> Shrink the size of the city and state columns. </para></listitem>
- <listitem><para>Add some color to make the state and city group headers stand out. </para></listitem>
- <listitem><para>Format the phone numbers. </para></listitem>
- <listitem><para>Sort customers by name.</para></listitem>
- </itemizedlist>
- </section>
+ </section>
</chapter>
16 years, 2 months