Author: dmaliarevich
Date: 2010-03-04 02:56:48 -0500 (Thu, 04 Mar 2010)
New Revision: 20636
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropWizard.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizard.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/OutputLinkWizard.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/PanelGridWizard.java
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/SelectItemsWizard.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardPage.java
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java
Log:
Images for some Drop From Palette Dialogs and Wizards were added.
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropWizard.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropWizard.java 2010-03-04
04:21:20 UTC (rev 20635)
+++
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/DropWizard.java 2010-03-04
07:56:48 UTC (rev 20636)
@@ -15,6 +15,7 @@
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
+import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.common.model.ui.editors.dnd.composite.TagProposalsComposite;
/**
@@ -31,6 +32,8 @@
*/
public DropWizard() {
setWindowTitle(DropWizardMessages.Wizard_Window_Title);
+ setDefaultPageImageDescriptor(ModelUIImages
+ .getImageDescriptor(ModelUIImages.WIZARD_DEFAULT));
}
public void setCommand(IDropCommand command) {
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizard.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizard.java 2010-03-04
04:21:20 UTC (rev 20635)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/DataTableWizard.java 2010-03-04
07:56:48 UTC (rev 20636)
@@ -17,6 +17,7 @@
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
+import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.common.model.ui.editors.dnd.*;
import org.jboss.tools.common.model.ui.editors.dnd.composite.TagProposalsComposite;
import org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteDropCommand;
@@ -31,6 +32,8 @@
public DataTableWizard () {
setWindowTitle(DropWizardMessages.Wizard_Window_Title);
+ setDefaultPageImageDescriptor(ModelUIImages
+ .getImageDescriptor(ModelUIImages.WIZARD_DEFAULT));
}
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/OutputLinkWizard.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/OutputLinkWizard.java 2010-03-04
04:21:20 UTC (rev 20635)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/OutputLinkWizard.java 2010-03-04
07:56:48 UTC (rev 20636)
@@ -16,6 +16,7 @@
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
+import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.common.model.ui.editors.dnd.*;
import org.jboss.tools.common.model.ui.editors.dnd.composite.*;
import org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteDropCommand;
@@ -31,6 +32,8 @@
public OutputLinkWizard (){
setWindowTitle(DropWizardMessages.Wizard_Window_Title);
+ setDefaultPageImageDescriptor(ModelUIImages
+ .getImageDescriptor(ModelUIImages.WIZARD_DEFAULT));
}
public boolean canFinish() {
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/PanelGridWizard.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/PanelGridWizard.java 2010-03-04
04:21:20 UTC (rev 20635)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/PanelGridWizard.java 2010-03-04
07:56:48 UTC (rev 20636)
@@ -15,6 +15,7 @@
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
+import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.common.model.ui.editors.dnd.*;
import org.jboss.tools.common.model.ui.editors.dnd.composite.*;
import org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteDropCommand;
@@ -32,6 +33,8 @@
*/
public PanelGridWizard() {
setWindowTitle(DropWizardMessages.Wizard_Window_Title);
+ setDefaultPageImageDescriptor(ModelUIImages
+ .getImageDescriptor(ModelUIImages.WIZARD_DEFAULT));
}
public void setCommand(IDropCommand command) {
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/SelectItemsWizard.java
===================================================================
---
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/SelectItemsWizard.java 2010-03-04
04:21:20 UTC (rev 20635)
+++
trunk/jsf/plugins/org.jboss.tools.jsf.ui/src/org/jboss/tools/jsf/ui/wizard/palette/SelectItemsWizard.java 2010-03-04
07:56:48 UTC (rev 20636)
@@ -16,6 +16,7 @@
import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
+import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.common.model.ui.editors.dnd.*;
import org.jboss.tools.common.model.ui.editors.dnd.composite.*;
import org.jboss.tools.jst.jsp.jspeditor.dnd.PaletteDropCommand;
@@ -32,6 +33,8 @@
public SelectItemsWizard() {
setWindowTitle(DropWizardMessages.Wizard_Window_Title);
+ setDefaultPageImageDescriptor(ModelUIImages
+ .getImageDescriptor(ModelUIImages.WIZARD_DEFAULT));
}
public boolean canFinish() {
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2010-03-04
04:21:20 UTC (rev 20635)
+++
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2010-03-04
07:56:48 UTC (rev 20636)
@@ -41,7 +41,7 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import org.jboss.tools.common.model.ui.ModelUIPlugin;
+import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.jst.jsp.JspEditorPlugin;
import org.jboss.tools.jst.jsp.outline.cssdialog.CSSStyleDialog;
import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants;
@@ -50,9 +50,6 @@
import org.jboss.tools.vpe.editor.Message;
import org.jboss.tools.vpe.editor.template.expression.VpeExpressionBuilderException;
import org.jboss.tools.vpe.messages.VpeUIMessages;
-import org.jboss.tools.vpe.resref.Activator;
-import org.jboss.tools.vpe.resref.core.Messages;
-import org.osgi.framework.Bundle;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
@@ -71,7 +68,6 @@
private Text txtValue;
private Text txtStyle;
private VpeEditAnyDialogValidator templateVerifier;
- private final String DIALOG_TITLE_IMAGE_PATH =
"/images/xstudio/wizards/EclipseDefault.png"; //$NON-NLS-1$
public VpeEditAnyDialog(Shell shell, VpeAnyData data) {
super(shell);
@@ -84,23 +80,10 @@
/*
* Setting dialog Title, Message, Image.
*/
- Bundle bundle = Platform.getBundle(ModelUIPlugin.PLUGIN_ID);
- URL url = null;
- if (null != bundle) {
- try {
- url = FileLocator.resolve(bundle.getEntry(DIALOG_TITLE_IMAGE_PATH));
- } catch (IOException e) {
- Activator.getDefault().logError(
- NLS.bind(Messages.VRD_TITLE_IMAGE_CANNOT_BE_RESOLVED,
- url), e);
- }
- }
- if (null != url) {
- ImageDescriptor image = ImageDescriptor.createFromURL(url);
- setTitleImage(image.createImage(null));
- }
getShell().setText(VpeUIMessages.TEMPLATE);
setTitle(VpeUIMessages.TAG_ATTRIBUTES);
+ setTitleImage(ModelUIImages.getImageDescriptor(
+ ModelUIImages.WIZARD_DEFAULT).createImage(null));
setMessage(VpeUIMessages.UNKNOWN_TAGS_DIALOG_DESCRIPTION);
/*
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardPage.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardPage.java 2010-03-04
04:21:20 UTC (rev 20635)
+++
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizardPage.java 2010-03-04
07:56:48 UTC (rev 20636)
@@ -1,13 +1,7 @@
package org.jboss.tools.vpe.resref.core;
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
@@ -18,10 +12,8 @@
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Layout;
import org.eclipse.swt.widgets.Listener;
-import org.jboss.tools.common.model.ui.ModelUIPlugin;
+import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.common.resref.core.ResourceReference;
-import org.jboss.tools.vpe.resref.Activator;
-import org.osgi.framework.Bundle;
public abstract class ReferenceWizardPage extends WizardPage
implements SelectionListener, Listener {
@@ -31,7 +23,6 @@
protected Object fileLocation = null;
protected ResourceReferenceValidator validator = null;
- private static final String PAGE_TITLE_IMAGE_PATH =
"/images/xstudio/wizards/EclipseDefault.png"; //$NON-NLS-1$
private Button pageRadioButton;
private Button folderRadioButton;
private Button projectRadioButton;
@@ -45,22 +36,7 @@
}
public static ImageDescriptor getImageDescriptor() {
- Bundle bundle = Platform.getBundle(ModelUIPlugin.PLUGIN_ID);
- URL url = null;
- ImageDescriptor image = null;
- if (null != bundle) {
- try {
- url = FileLocator.resolve(bundle.getEntry(PAGE_TITLE_IMAGE_PATH));
- } catch (IOException e) {
- Activator.getDefault().logError(
- NLS.bind(Messages.VRD_TITLE_IMAGE_CANNOT_BE_RESOLVED,
- url), e);
- }
- }
- if (null != url) {
- image = ImageDescriptor.createFromURL(url);
- }
- return image;
+ return ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_DEFAULT);
}
/**
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java
===================================================================
---
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java 2010-03-04
04:21:20 UTC (rev 20635)
+++
trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java 2010-03-04
07:56:48 UTC (rev 20636)
@@ -29,10 +29,8 @@
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.TabFolder;
import org.eclipse.swt.widgets.TabItem;
-import org.jboss.tools.common.model.ui.ModelUIPlugin;
+import org.jboss.tools.common.model.ui.ModelUIImages;
import org.jboss.tools.common.model.ui.action.CommandBar;
-import org.jboss.tools.vpe.resref.Activator;
-import org.osgi.framework.Bundle;
public class VpeResourcesDialog extends TitleAreaDialog {
@@ -44,7 +42,6 @@
RelativeFolderReferenceComposite relFolder = null;
CommandBar commandBar = new CommandBar();
- private final String DIALOG_TITLE_IMAGE_PATH =
"/images/xstudio/wizards/EclipseDefault.png"; //$NON-NLS-1$
private final int DIALOG_WIDTH = 400;
private final int DIALOG_HEIGHT = 300;
@@ -71,24 +68,10 @@
@Override
protected Control createDialogArea(Composite parent) {
-
- Bundle bundle = Platform.getBundle(ModelUIPlugin.PLUGIN_ID);
- URL url = null;
- if (null != bundle) {
- try {
- url = FileLocator.resolve(bundle.getEntry(DIALOG_TITLE_IMAGE_PATH));
- } catch (IOException e) {
- Activator.getDefault().logError(
- NLS.bind(Messages.VRD_TITLE_IMAGE_CANNOT_BE_RESOLVED,
- url), e);
- }
- }
- if (null != url) {
- ImageDescriptor image = ImageDescriptor.createFromURL(url);
- setTitleImage(image.createImage(null));
- }
getShell().setText(Messages.VRD_DEFAULT_WINDOW_TITLE);
setTitle(Messages.VRD_DEFAULT_TITLE);
+ setTitleImage(ModelUIImages.getImageDescriptor(
+ ModelUIImages.WIZARD_DEFAULT).createImage(null));
setMessage(Messages.VRD_PAGE_DESIGN_OPTIONS_ABOUT);
Composite composite = new Composite(parent, SWT.NONE);