Author: dmaliarevich Date: 2009-08-19 04:52:24 -0400 (Wed, 19 Aug 2009) New Revision: 17149 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardDialog.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizard.java trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardDialog.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.resref/src/org/jboss/tools/vpe/resref/core/messages.properties Log: https://jira.jboss.org/jira/browse/JBIDE-4785, dialog window titles were fixed. Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizard.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizard.java 2009-08-19 08:49:39 UTC (rev 17148) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizard.java 2009-08-19 08:52:24 UTC (rev 17149) @@ -2,8 +2,8 @@ public class CSSReferenceWizard extends ReferenceWizard { - public CSSReferenceWizard(Object fileLocation) { - super(fileLocation); + public CSSReferenceWizard(Object fileLocation, String windowTitle) { + super(fileLocation, windowTitle); } @Override Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardDialog.java 2009-08-19 08:49:39 UTC (rev 17148) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardDialog.java 2009-08-19 08:52:24 UTC (rev 17149) @@ -8,7 +8,8 @@ public CSSReferenceWizardDialog(Shell parentShell, Object fileLocation, ResourceReference resref) { - super(parentShell, new CSSReferenceWizard(fileLocation), resref); + super(parentShell, new CSSReferenceWizard(fileLocation, + Messages.VRD_ADD_CSS_PREFERENCE), resref); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardPage.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardPage.java 2009-08-19 08:49:39 UTC (rev 17148) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/CSSReferenceWizardPage.java 2009-08-19 08:52:24 UTC (rev 17149) @@ -8,22 +8,18 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; public class CSSReferenceWizardPage extends ReferenceWizardPage { - private String[] FILTER_EXTENSIONS = new String[] {"*.css"}; //$NON-NLS-1$ + private final String[] FILTER_EXTENSIONS = new String[] {"*.css"}; //$NON-NLS-1$ private String browseDialogFilterPath = null; private Text cssName = null; private String cssNameStr = ""; //$NON-NLS-1$ Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizard.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizard.java 2009-08-19 08:49:39 UTC (rev 17148) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizard.java 2009-08-19 08:52:24 UTC (rev 17149) @@ -6,8 +6,9 @@ protected ResourceReference[] resrefList = null; - public ELReferenceWizard(Object fileLocation, ResourceReference[] resrefList) { - super(fileLocation); + public ELReferenceWizard(Object fileLocation, String windowTitle, + ResourceReference[] resrefList) { + super(fileLocation, windowTitle); this.resrefList = resrefList; } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardDialog.java 2009-08-19 08:49:39 UTC (rev 17148) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ELReferenceWizardDialog.java 2009-08-19 08:52:24 UTC (rev 17149) @@ -8,7 +8,8 @@ public ELReferenceWizardDialog(Shell parentShell, Object fileLocation, ResourceReference resref, ResourceReference[] resrefList) { - super(parentShell, new ELReferenceWizard(fileLocation, resrefList), + super(parentShell, new ELReferenceWizard(fileLocation, + Messages.VRD_ADD_EL_PREFERENCE, resrefList), resref); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java 2009-08-19 08:49:39 UTC (rev 17148) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/ReferenceWizard.java 2009-08-19 08:52:24 UTC (rev 17149) @@ -15,10 +15,11 @@ */ ReferenceWizardPage page = null; - public ReferenceWizard(Object fileLocation) { + public ReferenceWizard(Object fileLocation, String windowTitle) { super(); this.fileLocation = fileLocation; createPage(); + setWindowTitle(windowTitle); } public void createPageControls(Composite pageContainer, Object fileLocation) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizard.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizard.java 2009-08-19 08:49:39 UTC (rev 17148) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizard.java 2009-08-19 08:52:24 UTC (rev 17149) @@ -4,8 +4,8 @@ - public TaglibReferenceWizard(Object fileLocation) { - super(fileLocation); + public TaglibReferenceWizard(Object fileLocation, String windowTitle) { + super(fileLocation, windowTitle); } @Override Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardDialog.java 2009-08-19 08:49:39 UTC (rev 17148) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/TaglibReferenceWizardDialog.java 2009-08-19 08:52:24 UTC (rev 17149) @@ -8,7 +8,8 @@ public TaglibReferenceWizardDialog(Shell parentShell, Object fileLocation, ResourceReference resref) { - super(parentShell, new TaglibReferenceWizard(fileLocation), resref); + super(parentShell, new TaglibReferenceWizard(fileLocation, + Messages.VRD_ADD_TAGLIB_PREFERENCE), resref); } } 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 2009-08-19 08:49:39 UTC (rev 17148) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/VpeResourcesDialog.java 2009-08-19 08:52:24 UTC (rev 17149) @@ -5,17 +5,12 @@ import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Platform; -import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.jface.wizard.Wizard; -import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Point; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -26,8 +21,6 @@ import org.eclipse.swt.widgets.TabItem; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.action.CommandBar; -import org.jboss.tools.common.model.ui.action.CommandBarLayout; -import org.jboss.tools.common.model.ui.wizards.query.AbstractQueryWizardView; import org.jboss.tools.vpe.resref.Activator; import org.osgi.framework.Bundle; @@ -48,7 +41,6 @@ public VpeResourcesDialog(Shell parentShell, Object fileLocation) { super(parentShell); -// setShellStyle(SWT.RESIZE); setHelpAvailable(false); this.fileLocation = fileLocation; init(fileLocation); @@ -67,9 +59,8 @@ relFolder.setObject(fileLocation); } -// @Override + @Override protected Control createDialogArea(Composite parent) { -// super.createDialogArea(parent); Bundle bundle = Platform.getBundle(ModelUIPlugin.PLUGIN_ID); URL url = null; Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties 2009-08-19 08:49:39 UTC (rev 17148) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/src/org/jboss/tools/vpe/resref/core/messages.properties 2009-08-19 08:52:24 UTC (rev 17149) @@ -1,5 +1,5 @@ # VpeResourcesDialog Main Window -VRD_TITLE_IMAGE_CANNOT_BE_RESOLVED=Title image for VPE Resouce Dialog cannot be resolved. URL={0} +VRD_TITLE_IMAGE_CANNOT_BE_RESOLVED=Title image for VPE Resource Dialog cannot be resolved. URL={0} VRD_DEFAULT_WINDOW_TITLE=Page Design Options VRD_DEFAULT_TITLE=Page Design Options VRD_DEFAULT_MESSAGE=Page Design Options