[jboss-cvs] jbosside/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages ...
Robert Stryker
rob.stryker at jboss.com
Fri Apr 20 05:42:02 EDT 2007
User: rawb
Date: 07/04/20 05:42:02
Modified: core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages
DefaultJARConfigWizardPage.java
FilesetInfoWizardPage.java
Added: core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages
ArchiveInfoWizardPage.java
Removed: core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages
PackageInfoWizardPage.java
Log:
Refactoring of class names
Revision Changes Path
1.3 +5 -5 jbosside/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/DefaultJARConfigWizardPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: DefaultJARConfigWizardPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/DefaultJARConfigWizardPage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- DefaultJARConfigWizardPage.java 20 Apr 2007 09:38:24 -0000 1.2
+++ DefaultJARConfigWizardPage.java 20 Apr 2007 09:42:02 -0000 1.3
@@ -6,19 +6,19 @@
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
-import org.jboss.ide.eclipse.archives.ui.PackagesSharedImages;
+import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
import org.jboss.ide.eclipse.archives.ui.providers.ArchivesContentProvider;
import org.jboss.ide.eclipse.archives.ui.providers.ArchivesLabelProvider;
-import org.jboss.ide.eclipse.archives.ui.wizards.AbstractPackageWizard;
+import org.jboss.ide.eclipse.archives.ui.wizards.ArchivePackageWizard;
import org.jboss.ide.eclipse.archives.ui.wizards.WizardPageWithNotification;
public class DefaultJARConfigWizardPage extends WizardPageWithNotification {
- private AbstractPackageWizard wizard;
+ private ArchivePackageWizard wizard;
- public DefaultJARConfigWizardPage (AbstractPackageWizard wizard) {
+ public DefaultJARConfigWizardPage (ArchivePackageWizard wizard) {
super ("Default JAR Configuration", "Default JAR Configuration",
- PackagesSharedImages.getImageDescriptor(PackagesSharedImages.IMG_NEW_JAR_WIZARD));
+ ArchivesSharedImages.getImageDescriptor(ArchivesSharedImages.IMG_NEW_JAR_WIZARD));
this.wizard = wizard;
}
1.3 +23 -23 jbosside/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: FilesetInfoWizardPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/FilesetInfoWizardPage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- FilesetInfoWizardPage.java 20 Apr 2007 09:38:24 -0000 1.2
+++ FilesetInfoWizardPage.java 20 Apr 2007 09:42:02 -0000 1.3
@@ -30,10 +30,10 @@
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.ArchivesCore;
-import org.jboss.ide.eclipse.archives.ui.PackagesSharedImages;
-import org.jboss.ide.eclipse.archives.ui.PackagesUIMessages;
+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.FilesetPreviewComposite;
-import org.jboss.ide.eclipse.archives.ui.util.composites.PackageNodeDestinationComposite;
+import org.jboss.ide.eclipse.archives.ui.util.composites.ArchiveNodeDestinationComposite;
public class FilesetInfoWizardPage extends WizardPage {
@@ -41,7 +41,7 @@
private IArchiveNode parentNode;
private Text includesText;
private Text excludesText;
- private PackageNodeDestinationComposite destinationComposite;
+ private ArchiveNodeDestinationComposite destinationComposite;
private String includes, excludes;
private IPath rootDir;
@@ -55,14 +55,14 @@
private Button rootDirFilesystemBrowseButton;
public FilesetInfoWizardPage (Shell parent, IArchiveFileSet fileset, IArchiveNode parentNode) {
- super(PackagesUIMessages.FilesetInfoWizardPage_new_title, PackagesUIMessages.FilesetInfoWizardPage_new_title, null);
+ super(ArchivesUIMessages.FilesetInfoWizardPage_new_title, ArchivesUIMessages.FilesetInfoWizardPage_new_title, null);
if (fileset == null) {
- setTitle(PackagesUIMessages.FilesetInfoWizardPage_new_title);
- setMessage(PackagesUIMessages.FilesetInfoWizardPage_new_message);
+ setTitle(ArchivesUIMessages.FilesetInfoWizardPage_new_title);
+ setMessage(ArchivesUIMessages.FilesetInfoWizardPage_new_message);
} else {
- setTitle(PackagesUIMessages.FilesetInfoWizardPage_edit_title);
- setMessage(PackagesUIMessages.FilesetInfoWizardPage_edit_message);
+ setTitle(ArchivesUIMessages.FilesetInfoWizardPage_edit_title);
+ setMessage(ArchivesUIMessages.FilesetInfoWizardPage_edit_message);
}
this.fileset = fileset;
@@ -120,12 +120,12 @@
previewGroup.setLayout(new FormLayout());
previewComposite = new FilesetPreviewComposite(previewGroup, SWT.NONE);
previewComposite.setLayoutData(createFormData(0,0,100,0,0,0,100,0));
- previewGroup.setText(PackagesUIMessages.FilesetInfoWizardPage_previewGroup_label);
+ previewGroup.setText(ArchivesUIMessages.FilesetInfoWizardPage_previewGroup_label);
return previewGroup;
}
private Group createInfoGroup(Composite mainComposite) {
Group infoGroup = new Group(mainComposite, SWT.NONE);
- infoGroup.setText(PackagesUIMessages.FilesetInfoWizardPage_infoGroup_title);
+ infoGroup.setText(ArchivesUIMessages.FilesetInfoWizardPage_infoGroup_title);
// positioning in parent
infoGroup.setLayoutData(createFormData(0,5,null,0,0,5,100,-5));
@@ -138,7 +138,7 @@
// destination row
Label destinationKey = new Label(infoGroup, SWT.NONE);
- destinationComposite = new PackageNodeDestinationComposite(infoGroup, SWT.NONE, parentNode);
+ destinationComposite = new ArchiveNodeDestinationComposite(infoGroup, SWT.NONE, parentNode);
destinationKey.setLayoutData(createFormData(0,10,null,0,null,5, 0, max));
destinationComposite.setLayoutData(createFormData(0,5,null,0,destinationKey,5, 100, -5));
@@ -205,17 +205,17 @@
// customize widgets
- destinationKey.setText(PackagesUIMessages.FilesetInfoWizardPage_destination_label);
- rootProjectKey.setText(PackagesUIMessages.FilesetInfoWizardPage_rootProject_label);
+ destinationKey.setText(ArchivesUIMessages.FilesetInfoWizardPage_destination_label);
+ rootProjectKey.setText(ArchivesUIMessages.FilesetInfoWizardPage_rootProject_label);
projectImageLabel.setImage(
PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT));
- rootDirectoryLabel.setText(PackagesUIMessages.FilesetInfoWizardPage_rootDirectory_label);
- rootDirWorkspaceBrowseButton.setText(PackagesUIMessages.FilesetInfoWizardPage_rootDirWorkspaceBrowseButton_label);
- rootDirFilesystemBrowseButton.setText(PackagesUIMessages.FilesetInfoWizardPage_rootDirFilesystemBrowseButton_label);
- includesImage.setImage(PackagesSharedImages.getImage(PackagesSharedImages.IMG_INCLUDES));
- includesTextLabel.setText(PackagesUIMessages.FilesetInfoWizardPage_includes_label);
- excludesImage.setImage(PackagesSharedImages.getImage(PackagesSharedImages.IMG_EXCLUDES));
- excludesTextLabel.setText(PackagesUIMessages.FilesetInfoWizardPage_excludes_label);
+ rootDirectoryLabel.setText(ArchivesUIMessages.FilesetInfoWizardPage_rootDirectory_label);
+ rootDirWorkspaceBrowseButton.setText(ArchivesUIMessages.FilesetInfoWizardPage_rootDirWorkspaceBrowseButton_label);
+ rootDirFilesystemBrowseButton.setText(ArchivesUIMessages.FilesetInfoWizardPage_rootDirFilesystemBrowseButton_label);
+ includesImage.setImage(ArchivesSharedImages.getImage(ArchivesSharedImages.IMG_INCLUDES));
+ includesTextLabel.setText(ArchivesUIMessages.FilesetInfoWizardPage_includes_label);
+ excludesImage.setImage(ArchivesSharedImages.getImage(ArchivesSharedImages.IMG_EXCLUDES));
+ excludesTextLabel.setText(ArchivesUIMessages.FilesetInfoWizardPage_excludes_label);
rootDirText.setEnabled(false);
return infoGroup;
@@ -307,7 +307,7 @@
private void browseWorkspaceForRootDir () {
IContainer workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
ContainerSelectionDialog dialog = new ContainerSelectionDialog(getShell(), workspaceRoot, true,
- PackagesUIMessages.FilesetInfoWizardPage_rootDirWorkspaceBrowser_message);
+ ArchivesUIMessages.FilesetInfoWizardPage_rootDirWorkspaceBrowser_message);
int response = dialog.open();
if (response == Dialog.OK) {
@@ -344,7 +344,7 @@
rootDirText.setText(path);
rootDir = new Path(path);
rootDirIsWorkspaceRelative = false;
- rootProjectLabel.setText(PackagesUIMessages.FilesetInfoWizardPage_noProjectMessage);
+ rootProjectLabel.setText(ArchivesUIMessages.FilesetInfoWizardPage_noProjectMessage);
changePreview();
}
}
1.1 date: 2007/04/20 09:42:02; author: rawb; state: Exp;jbosside/core/plugins/org.jboss.ide.eclipse.archives.ui/src/main/org/jboss/ide/eclipse/archives/ui/wizards/pages/ArchiveInfoWizardPage.java
Index: ArchiveInfoWizardPage.java
===================================================================
package org.jboss.ide.eclipse.archives.ui.wizards.pages;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
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.Group;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.jboss.ide.eclipse.archives.core.Trace;
import org.jboss.ide.eclipse.archives.core.model.IArchive;
import org.jboss.ide.eclipse.archives.core.model.IArchiveNode;
import org.jboss.ide.eclipse.archives.core.model.internal.ArchivesModel;
import org.jboss.ide.eclipse.archives.ui.ArchivesSharedImages;
import org.jboss.ide.eclipse.archives.ui.ArchivesUIMessages;
import org.jboss.ide.eclipse.archives.ui.util.DestinationChangeListener;
import org.jboss.ide.eclipse.archives.ui.util.ArchiveNodeFactory;
import org.jboss.ide.eclipse.archives.ui.util.composites.ArchiveDestinationComposite;
import org.jboss.ide.eclipse.archives.ui.wizards.ArchivePackageWizard;
import org.jboss.ide.eclipse.archives.ui.wizards.WizardPageWithNotification;
import org.jboss.ide.eclipse.archives.ui.wizards.WizardWithNotification;
public class ArchiveInfoWizardPage extends WizardPageWithNotification {
private ArchivePackageWizard wizard;
private Text packageNameText;
private Button compressedButton;
private Button explodedButton;
private String packageName;
private boolean packageExploded;
private ArchiveDestinationComposite destinationComposite;
private IArchive pkg;
public ArchiveInfoWizardPage (ArchivePackageWizard wizard, IArchive existingPackage) {
super (ArchivesUIMessages.PackageInfoWizardPage_title, ArchivesUIMessages.PackageInfoWizardPage_title, wizard.getImageDescriptor());
setWizard(wizard);
this.pkg = existingPackage;
}
public void createControl(Composite parent) {
setMessage(ArchivesUIMessages.PackageInfoWizardPage_message);
Composite main = new Composite(parent, SWT.NONE);
main.setLayout(new GridLayout(1, false));
Group infoGroup = new Group(main, SWT.NONE);
infoGroup.setLayout(new GridLayout(3, false));
infoGroup.setText(ArchivesUIMessages.PackageInfoWizardPage_infoGroup_label);
expand(infoGroup);
new Label(infoGroup, SWT.NONE).setText(ArchivesUIMessages.PackageInfoWizardPage_packageName_label);
Composite pkgNameComposite = new Composite(infoGroup, SWT.NONE);
GridLayout pkgNameLayout = new GridLayout(2, false);
pkgNameLayout.marginHeight = 0;
pkgNameLayout.marginWidth = 0;
pkgNameComposite.setLayout(pkgNameLayout);
pkgNameComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
new Label(pkgNameComposite, SWT.NONE).setImage(ArchivesSharedImages.getImage(ArchivesSharedImages.IMG_PACKAGE));
packageNameText = new Text(pkgNameComposite, SWT.BORDER);
System.out.println(wizard.getProject());
packageName = wizard.getProject().getName();
packageName += "." + wizard.getPackageExtension();
packageNameText.setText(packageName);
packageNameText.setSelection(0, wizard.getProject().getName().length());
expand(packageNameText);
GridData pkgNameData = new GridData(GridData.FILL_HORIZONTAL);
pkgNameData.horizontalSpan = 2;
pkgNameComposite.setLayoutData(pkgNameData);
packageNameText.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
if (validate())
{
packageName = packageNameText.getText();
}
}
});
new Label(infoGroup, SWT.NONE).setText(ArchivesUIMessages.PackageInfoWizardPage_destination_label);
GridData destinationTextData = new GridData(GridData.FILL_BOTH);
destinationTextData.horizontalSpan = 2;
GridData buttonData = new GridData(GridData.FILL_HORIZONTAL);
buttonData.horizontalSpan = 3;
buttonData.horizontalAlignment = SWT.END;
Object destination = wizard.getSelectedDestination();
destinationComposite = new ArchiveDestinationComposite(
infoGroup, SWT.NONE, destination);
destinationComposite.addDestinationChangeListener(new DestinationChangeListener () {
public void destinationChanged(Object newDestination) {
validate();
}
});
destinationComposite.setLayoutData(destinationTextData);
Group packageTypeGroup = new Group(main, SWT.NONE);
packageTypeGroup.setLayout(new GridLayout(1, false));
packageTypeGroup.setText(ArchivesUIMessages.PackageInfoWizardPage_packageTypeGroup_label);
expand(packageTypeGroup);
packageExploded = false;
compressedButton = new Button(packageTypeGroup, SWT.RADIO);
compressedButton.setText(ArchivesUIMessages.PackageInfoWizardPage_compressedButton_label);
compressedButton.addSelectionListener(new SelectionAdapter() {
public void widgetSelected(SelectionEvent e) {
packageExploded = false;
}
});
compressedButton.setSelection(true);
explodedButton = new Button(packageTypeGroup, SWT.RADIO);
explodedButton.addSelectionListener(new SelectionAdapter () {
public void widgetSelected(SelectionEvent e) {
packageExploded = true;
}
});
explodedButton.setText(ArchivesUIMessages.PackageInfoWizardPage_explodedButton_label);
setControl(main);
fillDefaults();
validate();
}
private void fillDefaults ()
{
if (pkg != null)
{
compressedButton.setSelection(!pkg.isExploded());
explodedButton.setSelection(pkg.isExploded());
packageNameText.setText(pkg.getName());
packageName = pkg.getName();
if (pkg.isTopLevel()) {
// TODO: FIX THIS
destinationComposite.setPackageNodeDestination(pkg.getDestinationPath());
} else {
destinationComposite.setPackageNodeDestination(pkg.getParent());
}
if (pkg.isExploded())
{
explodedButton.setEnabled(true);
} else {
compressedButton.setEnabled(true);
}
}
}
private boolean validate ()
{
if (packageNameText.getText() == null || packageNameText.getText().length() == 0)
{
setErrorMessage(ArchivesUIMessages.PackageInfoWizardPage_error_noPackageName);
setPageComplete(false);
return false;
}
else {
setErrorMessage(null);
}
Object destination = getPackageDestination();
if (destination instanceof IArchiveNode)
{
IArchiveNode parentNode = (IArchiveNode) destination;
// verify no child has the same name
IArchiveNode subPackages[] = parentNode.getChildren(IArchiveNode.TYPE_ARCHIVE);
for (int i = 0; i < subPackages.length; i++)
{
IArchive subPackage = (IArchive) subPackages[i];
if (subPackage.getName().equals(packageNameText.getText())
&& (!pkg.equals(this.pkg)))
{
setErrorMessage(
ArchivesUIMessages.bind(
ArchivesUIMessages.PackageInfoWizardPage_error_packageAlreadyExists, packageNameText.getText()));
setPageComplete(false);
return false;
}
}
} else if (destination instanceof IContainer) {
IContainer container = (IContainer) destination;
IArchive[] packages = ArchivesModel.instance().getProjectArchives(wizard.getProject());
if (packages != null) {
for( int i = 0; i < packages.length; i++ ) {
IArchive pkg = (IArchive) packages[i];
if (pkg.getName().equals(packageNameText.getText())
&& (pkg.getDestinationPath() != null && pkg.getDestinationPath().equals(container.getFullPath()))
&& (!pkg.equals(this.pkg)))
{
setErrorMessage(
ArchivesUIMessages.bind(
ArchivesUIMessages.PackageInfoWizardPage_error_packageAlreadyExists, packageNameText.getText()));
setPageComplete(false);
return false;
}
}
}
} else if (destination instanceof IPath) {
IPath path = (IPath) destination;
IArchive[] packages = ArchivesModel.instance().getProjectArchives(wizard.getProject());
if (packages != null) {
for( int i = 0; i < packages.length; i++ ) {
IArchive pkg = (IArchive) packages[i];
if (pkg.getName().equals(packageNameText.getText())
&& (pkg.getDestinationPath() != null && pkg.getDestinationPath().equals(path))
&& (!pkg.equals(this.pkg)))
{
setErrorMessage(
ArchivesUIMessages.bind(
ArchivesUIMessages.PackageInfoWizardPage_error_packageAlreadyExists, packageNameText.getText()));
setPageComplete(false);
return false;
}
}
} else if (destination == null) {
setErrorMessage(ArchivesUIMessages.PackageInfoWizardPage_error_noDestination);
setPageComplete(false);
return false;
}
}
setPageComplete(true);
return true;
}
public void pageExited(int button) {
Trace.trace(getClass(), "pageExited");
if (button == WizardWithNotification.NEXT || button == WizardWithNotification.FINISH)
{
createPackage();
}
}
private void createPackage () {
Trace.trace(getClass(), "creating package");
Object destContainer = getPackageDestination();
IProject project = null;
if (destContainer instanceof IArchiveNode) {
project = ((IArchiveNode)destContainer).getProject();
} else if (destContainer instanceof IContainer) {
project = ((IContainer)destContainer).getProject();
} else {
project = wizard.getProject();
}
if (pkg == null) {
pkg = ArchiveNodeFactory.createPackage();
}
pkg.setName(getPackageName());
pkg.setExploded(isPackageExploded());
if (destContainer instanceof IContainer) {
pkg.setDestinationPath(((IContainer)destContainer).getFullPath() , true);
} else if (destContainer instanceof IPath) {
pkg.setDestinationPath((IPath) destContainer, false);
}
}
private void expand(Control control)
{
control.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
}
public String getPackageName() {
return packageName;
}
public boolean isPackageExploded() {
return packageExploded;
}
public Object getPackageDestination() {
return destinationComposite.getPackageNodeDestination();
}
private void setWizard(ArchivePackageWizard wizard)
{
this.wizard = wizard;
}
public IArchive getPackage ()
{
return pkg;
}
}
More information about the jboss-cvs-commits
mailing list