diff options
author | Rob Stryker | 2017-10-17 20:28:42 +0000 |
---|---|---|
committer | Rob Stryker | 2017-10-17 20:28:42 +0000 |
commit | f697c7ef26de07dcb05d8290c64b2002c44cdbe0 (patch) | |
tree | f3f194eaa066173df32f66155507172206c522b2 | |
parent | aed1fc923dec3f879c3cd6d1c9ac6abb1d91461b (diff) | |
download | webtools.common-f697c7ef26de07dcb05d8290c64b2002c44cdbe0.tar.gz webtools.common-f697c7ef26de07dcb05d8290c64b2002c44cdbe0.tar.xz webtools.common-f697c7ef26de07dcb05d8290c64b2002c44cdbe0.zip |
519716 - move jst.common.ui into jeetools
Signed-off-by: Rob Stryker <stryker@redhat.com>
24 files changed, 0 insertions, 2223 deletions
diff --git a/plugins/org.eclipse.jst.common.ui/.classpath b/plugins/org.eclipse.jst.common.ui/.classpath deleted file mode 100644 index 64c5e31b7..000000000 --- a/plugins/org.eclipse.jst.common.ui/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/plugins/org.eclipse.jst.common.ui/.project b/plugins/org.eclipse.jst.common.ui/.project deleted file mode 100644 index b886d2717..000000000 --- a/plugins/org.eclipse.jst.common.ui/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jst.common.ui</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/plugins/org.eclipse.jst.common.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jst.common.ui/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index bf02908ca..000000000 --- a/plugins/org.eclipse.jst.common.ui/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,74 +0,0 @@ -#Fri Sep 11 19:24:47 PDT 2009 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=ignore -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning -org.eclipse.jdt.core.compiler.problem.deadCode=warning -org.eclipse.jdt.core.compiler.problem.deprecation=warning -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=warning -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore -org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=error -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=error -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=error -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning -org.eclipse.jdt.core.compiler.problem.nullReference=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=error -org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore -org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore -org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore -org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=error -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=error -org.eclipse.jdt.core.compiler.problem.unusedLabel=error -org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error -org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=ignore -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/plugins/org.eclipse.jst.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.ui/META-INF/MANIFEST.MF deleted file mode 100644 index b1c45f6f5..000000000 --- a/plugins/org.eclipse.jst.common.ui/META-INF/MANIFEST.MF +++ /dev/null @@ -1,22 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-Vendor: %provider -Bundle-SymbolicName: org.eclipse.jst.common.ui;singleton:=true -Bundle-Version: 1.0.301.qualifier -Bundle-Localization: plugin -Bundle-Activator: org.eclipse.jst.common.ui.internal.JstCommonUIPlugin -Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", - org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", - org.eclipse.jdt.core;bundle-version="[3.5.0,4.0.0)", - org.eclipse.jdt.ui;bundle-version="[3.5.0,4.0.0)", - org.eclipse.wst.common.modulecore;bundle-version="[1.1.300,2.0.0)", - org.eclipse.wst.common.modulecore.ui;bundle-version="[1.0.0,2.0.0)", - org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)", - org.eclipse.jst.common.frameworks;bundle-version="1.1.400", - org.eclipse.wst.common.frameworks;bundle-version="1.2.0", - org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)" -Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.jst.common.ui.internal;x-internal:=true, - org.eclipse.jst.common.ui.internal.assembly.wizard;x-internal:=true diff --git a/plugins/org.eclipse.jst.common.ui/about.html b/plugins/org.eclipse.jst.common.ui/about.html deleted file mode 100644 index b6ed5b048..000000000 --- a/plugins/org.eclipse.jst.common.ui/about.html +++ /dev/null @@ -1,34 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<HTML> - -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> - -<BODY lang="EN-US"> - -<H3>About This Content</H3> - -<P>August, 2009</P> - -<H3>License</H3> - -<P>The Eclipse Foundation makes available all content in this plug-in -("Content"). Unless otherwise indicated below, the Content is provided to you -under the terms and conditions of the Eclipse Public License Version 1.0 -("EPL"). A copy of the EPL is available at -<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. -For purposes of the EPL, "Program" will mean the Content.</P> - -<P>If you did not receive this Content directly from the Eclipse Foundation, the -Content is being redistributed by another party ("Redistributor") and different -terms and conditions may apply to your use of any object code in the Content. -Check the Redistributor’s license that was provided with the Content. If no such -license exists, contact the Redistributor. Unless otherwise indicated below, the -terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at -<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P> - -</BODY> -</HTML> diff --git a/plugins/org.eclipse.jst.common.ui/build.properties b/plugins/org.eclipse.jst.common.ui/build.properties deleted file mode 100644 index 4b147f0e6..000000000 --- a/plugins/org.eclipse.jst.common.ui/build.properties +++ /dev/null @@ -1,18 +0,0 @@ -############################################################################### -# Copyright (c) 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -source.. = src/ -output.. = bin/ -bin.includes = plugin.xml,\ - .,\ - icons/,\ - META-INF/,\ - about.html,\ - plugin.properties diff --git a/plugins/org.eclipse.jst.common.ui/icons/jar_obj.gif b/plugins/org.eclipse.jst.common.ui/icons/jar_obj.gif Binary files differdeleted file mode 100644 index 2fa1d777b..000000000 --- a/plugins/org.eclipse.jst.common.ui/icons/jar_obj.gif +++ /dev/null diff --git a/plugins/org.eclipse.jst.common.ui/icons/manifest-classpath-banner.png b/plugins/org.eclipse.jst.common.ui/icons/manifest-classpath-banner.png Binary files differdeleted file mode 100644 index 7c3e20821..000000000 --- a/plugins/org.eclipse.jst.common.ui/icons/manifest-classpath-banner.png +++ /dev/null diff --git a/plugins/org.eclipse.jst.common.ui/icons/util-wiz-icon.gif b/plugins/org.eclipse.jst.common.ui/icons/util-wiz-icon.gif Binary files differdeleted file mode 100644 index 2038b22ad..000000000 --- a/plugins/org.eclipse.jst.common.ui/icons/util-wiz-icon.gif +++ /dev/null diff --git a/plugins/org.eclipse.jst.common.ui/plugin.properties b/plugins/org.eclipse.jst.common.ui/plugin.properties deleted file mode 100644 index f0ba4b02f..000000000 --- a/plugins/org.eclipse.jst.common.ui/plugin.properties +++ /dev/null @@ -1,16 +0,0 @@ -############################################################################### -# Copyright (c) 2009 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -provider=Eclipse.org - -Bundle-Name.0 = Common JST UI Plug-in -Archive=Archives from Workspace -External_Archive=Archives from File System -Variable=Archive via Path Variable diff --git a/plugins/org.eclipse.jst.common.ui/plugin.xml b/plugins/org.eclipse.jst.common.ui/plugin.xml deleted file mode 100644 index 16e598fc5..000000000 --- a/plugins/org.eclipse.jst.common.ui/plugin.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.4"?> -<plugin> - - <extension - point="org.eclipse.wst.common.modulecore.ui.referenceWizardFragment"> - <referenceFragment - class="org.eclipse.jst.common.ui.internal.assembly.wizard.JarReferenceWizardFragment" - icon="icons/jar_obj.gif" - id="org.eclipse.jst.common.ui.jarReference" - name="%Archive"> - </referenceFragment> - <referenceFragment - class="org.eclipse.jst.common.ui.internal.assembly.wizard.ExternalJarReferenceWizardFragment" - icon="icons/jar_obj.gif" - id="org.eclipse.jst.common.ui.externalJarReference" - name="%External_Archive"> - </referenceFragment> - <referenceFragment - class="org.eclipse.jst.common.ui.internal.assembly.wizard.VariableReferenceWizardFragment" - icon="icons/jar_obj.gif" - id="org.eclipse.jst.common.ui.variableReference" - name="%Variable"> - </referenceFragment> - </extension> - <extension point="org.eclipse.wst.common.modulecore.ui.virtualComponentLabelProvider"> - <provider class="org.eclipse.jst.common.ui.internal.assembly.wizard.ClasspathContainerRefLabelProvider" weight="3"/> - </extension> -</plugin> diff --git a/plugins/org.eclipse.jst.common.ui/pom.xml b/plugins/org.eclipse.jst.common.ui/pom.xml deleted file mode 100644 index 671be3134..000000000 --- a/plugins/org.eclipse.jst.common.ui/pom.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2012, 2013 Eclipse Foundation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Distribution License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/org/documents/edl-v10.php
-
- Contributors:
- Thanh Ha (Eclipse Foundation) - initial implementation
--->
-
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.webtools.common</groupId>
- <artifactId>org.eclipse.webtools.common.plugins</artifactId> - <version>3.6.0-SNAPSHOT</version>
- </parent>
-
- <groupId>org.eclipse.webtools.common</groupId>
- <artifactId>org.eclipse.jst.common.ui</artifactId>
- <version>1.0.301-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/IJstCommonUIConstants.java b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/IJstCommonUIConstants.java deleted file mode 100644 index bb14fb701..000000000 --- a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/IJstCommonUIConstants.java +++ /dev/null @@ -1,19 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.common.ui.internal; - - -/** - * @author: Aidyl Kareh - */ -public interface IJstCommonUIConstants { - public static final String DIALOGSTORE_LASTEXTARCHIVE= JstCommonUIPlugin.PLUGIN_ID + ".lastextarchive"; //$NON-NLS-1$ -} diff --git a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/IJstCommonUIContextIds.java b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/IJstCommonUIContextIds.java deleted file mode 100644 index a04afadc6..000000000 --- a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/IJstCommonUIContextIds.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003, 2010 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.common.ui.internal; - -/** - * @author: Aidyl Kareh - */ -public interface IJstCommonUIContextIds { - // New references wizards - public static final String DEPLOYMENT_ASSEMBLY_NEW_VARIABLE_REFERENCE_P1 = JstCommonUIPlugin.PLUGIN_ID + ".DEPLOYMENT_ASSEMBLY_NEW_VARIABLE_REFERENCE_P1"; //$NON-NLS-1$ - public static final String DEPLOYMENT_ASSEMBLY_NEW_EXTERNAL_ARCHIVE_REFERENCE_P1 = JstCommonUIPlugin.PLUGIN_ID + ".DEPLOYMENT_ASSEMBLY_NEW_EXTERNAL_ARCHIVE_REFERENCE_P1"; //$NON-NLS-1$ - public static final String DEPLOYMENT_ASSEMBLY_NEW_ARCHIVE_REFERENCE_P1 = JstCommonUIPlugin.PLUGIN_ID + ".DEPLOYMENT_ASSEMBLY_NEW_ARCHIVE_REFERENCE_P1"; //$NON-NLS-1$ - public static final String DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_MANIFEST_ENTRIES_TAB = JstCommonUIPlugin.PLUGIN_ID + ".DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_MANIFEST_ENTRIES_TAB"; //$NON-NLS-1$ -} diff --git a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/JstCommonUIPlugin.java b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/JstCommonUIPlugin.java deleted file mode 100644 index 57b9ef07c..000000000 --- a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/JstCommonUIPlugin.java +++ /dev/null @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.common.ui.internal; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class JstCommonUIPlugin extends AbstractUIPlugin { - - // The plug-in ID - public static final String PLUGIN_ID = "org.eclipse.jst.common.ui"; //$NON-NLS-1$ - - // The shared instance - private static JstCommonUIPlugin plugin; - - /** - * The constructor - */ - public JstCommonUIPlugin() { - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext) - */ - public void start(BundleContext context) throws Exception { - super.start(context); - plugin = this; - } - - /* - * (non-Javadoc) - * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext) - */ - public void stop(BundleContext context) throws Exception { - plugin = null; - super.stop(context); - } - - /** - * Returns the shared instance - * - * @return the shared instance - */ - public static JstCommonUIPlugin getDefault() { - return plugin; - } - -} diff --git a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/Messages.java b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/Messages.java deleted file mode 100644 index 8954feac1..000000000 --- a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/Messages.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.common.ui.internal; - -import org.eclipse.osgi.util.NLS; - -public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.jst.common.ui.internal"; //$NON-NLS-1$ - public static String ArchiveTitle; - public static String ArchiveDescription; - public static String ExternalArchiveTitle; - public static String ExternalArchiveDescription; - public static String ArchiveDialogNewTitle; - public static String ArchiveDialogNewDescription; - public static String Browse; - public static String VariableReferenceTitle; - public static String VariableReferenceDescription; - public static String AddManifestEntryTaskWizardTitle; - public static String AddManifestEntryTaskWizardDesc; - public static String ParentProject; - public static String CustomEntryButton; - public static String Add; - public static String Remove; - public static String MoveUp; - public static String MoveDown; - public static String ManifestEntryColumn; - public static String ManifestEntrySourceColumn; - public static String ConfigureParentLink; - public static String InvalidArchivesWarning; - public static String WarningTitleDialog; - - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME + ".messages", Messages.class); //$NON-NLS-1$ - } - - private Messages() { - } -} diff --git a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/AddManifestEntryTaskWizard.java b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/AddManifestEntryTaskWizard.java deleted file mode 100644 index 200f994c9..000000000 --- a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/AddManifestEntryTaskWizard.java +++ /dev/null @@ -1,237 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2010 Red Hat and Others - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Rob Stryker - initial implementation and ongoing maintenance - * Konstantin Komissarchik - misc. UI cleanup - ******************************************************************************/ -package org.eclipse.jst.common.ui.internal.assembly.wizard; - -import java.lang.reflect.InvocationTargetException; -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.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.preference.PreferenceDialog; -import org.eclipse.jface.viewers.ArrayContentProvider; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.common.internal.modulecore.util.JavaModuleComponentUtility; -import org.eclipse.jst.common.ui.internal.JstCommonUIPlugin; -import org.eclipse.jst.common.ui.internal.Messages; -import org.eclipse.jst.common.ui.internal.assembly.wizard.ManifestModuleDependencyControl.ManifestLabelProvider; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -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.Link; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.internal.IWorkbenchGraphicConstants; -import org.eclipse.ui.internal.WorkbenchImages; -import org.eclipse.ui.internal.dialogs.PropertyDialog; -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.internal.impl.TaskModel; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle; -import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.TaskWizard; -import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.WizardFragment; - -public class AddManifestEntryTaskWizard extends TaskWizard { - public static final String PARENT_PROJECT = "PARENT_PROJECT"; // data model key //$NON-NLS-1$ - public static final String CHILD_PROJECT = "CHILD_PROJECT"; // data model key //$NON-NLS-1$ - public static final String CURRENT_REFERENCES = "CURRENT_REFERENCES"; // data model key for return val //$NON-NLS-1$ - public static final String RETURNED_REFERENCES = "RETURNED_REFERENCES"; // data model key for return val //$NON-NLS-1$ - public AddManifestEntryTaskWizard() { - super(Messages.AddManifestEntryTaskWizardTitle, new ManifestRootFragment()); - } - - public static class ManifestRootFragment extends WizardFragment { - private TableViewer viewer; - private Button addCustom; - private Text customEntryText; - protected IProject parentProject, childProject; - private IVirtualReference[] selected; - private ShowPossibleManifestEntryContentProvider contentProvider; - private Link parentContainerLink; - public boolean hasComposite() { - return true; - } - private void updateWidgets() throws InvocationTargetException { - - viewer.setInput(ResourcesPlugin.getWorkspace()); - viewer.refresh(); - } - - private static GridLayout glayout( final int columns ) - { - final GridLayout gl = new GridLayout( columns, false ); - gl.marginWidth = 0; - gl.marginHeight = 0; - - return gl; - } - - public Composite createComposite(Composite parent, IWizardHandle handle) { - parentProject = (IProject)getTaskModel().getObject(PARENT_PROJECT); - childProject = (IProject)getTaskModel().getObject(CHILD_PROJECT); - handle.setTitle(Messages.AddManifestEntryTaskWizardTitle); - handle.setDescription(NLS.bind(Messages.AddManifestEntryTaskWizardDesc, parentProject.getName())); - handle.setImageDescriptor(WorkbenchImages.getImageDescriptor(IWorkbenchGraphicConstants.IMG_WIZBAN_EXPORT_WIZ)); - handle.setImageDescriptor( AbstractUIPlugin.imageDescriptorFromPlugin( JstCommonUIPlugin.PLUGIN_ID, "icons/manifest-classpath-banner.png" ) ); - - Composite root = new Composite(parent, SWT.NONE); - root.setLayout(glayout(1)); - - viewer = ManifestModuleDependencyControl.createManifestReferenceTableViewer(root, SWT.MULTI); - final GridData gData = new GridData(GridData.FILL_BOTH); - gData.heightHint = 350; - viewer.getTable().setLayoutData(gData); - contentProvider = new ShowPossibleManifestEntryContentProvider(parentProject, childProject, getTaskModel()); - viewer.setContentProvider(contentProvider); - viewer.setLabelProvider(new ManifestLabelProvider()); - viewer.setInput(ResourcesPlugin.getWorkspace()); - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - viewerSelectionChanged(); - } - }); - - final Composite customEntryComposite = new Composite(root,SWT.NONE); - customEntryComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - customEntryComposite.setLayout(glayout(2)); - - customEntryText = new Text(customEntryComposite, SWT.BORDER); - customEntryText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - customEntryText.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - if(customEntryText.getText() == null || customEntryText.getText().trim().length() == 0 || new Path(customEntryText.getText().trim()).makeRelative().toString().length() == 0) - addCustom.setEnabled(false); - else - addCustom.setEnabled(true); - } - }); - - addCustom = new Button(customEntryComposite, SWT.PUSH); - addCustom.setLayoutData(new GridData()); - addCustom.setText(Messages.CustomEntryButton); - addCustom.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - addCustomPressed(); - } - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - addCustom.setEnabled(false); - - createConfigLink(root); - parentContainerLink.setLayoutData(new GridData()); - - return root; - } - - private void addCustomPressed() { - IVirtualReference ref = ManifestModuleDependencyControl.createDummyReference( - new Path(customEntryText.getText()).toString(), parentProject, ComponentCore.createComponent(parentProject)); - contentProvider.addPossibleReference(ref); - customEntryText.setText(""); //$NON-NLS-1$ - addCustom.setEnabled(false); - viewer.refresh(); - } - - private void viewerSelectionChanged() { - IStructuredSelection sel = (IStructuredSelection)viewer.getSelection(); - Object[] obj = sel.toArray(); - IVirtualReference[] ret = new IVirtualReference[obj.length]; - for( int i = 0; i < ret.length; i++ ) { - ret[i] = (IVirtualReference)obj[i]; - } - selected = ret; - } - - private void createConfigLink(Composite aGroup){ - parentContainerLink = new Link(aGroup,SWT.None); - parentContainerLink.setText("<A>"+ //$NON-NLS-1$ - Messages.ConfigureParentLink+"</A>"); //$NON-NLS-1$ - parentContainerLink.addSelectionListener(new SelectionListener() { - - public void doLinkActivated(Link e) { - IProject parentProject = ManifestRootFragment.this.parentProject; - PreferenceDialog dialog = PropertyDialog.createDialogOn(ManifestRootFragment.this.getPage().getControl().getShell(), - "org.eclipse.wst.common.componentcore.ui.DeploymentAssemblyPage", parentProject); //$NON-NLS-1$ - if (dialog != null) { - dialog.open(); - } - try { - updateWidgets(); - } catch (InvocationTargetException ie) { - - } - } - - public void widgetDefaultSelected(SelectionEvent e) { - doLinkActivated((Link) e.widget); - } - - public void widgetSelected(SelectionEvent e) { - doLinkActivated((Link) e.widget); - } - }); - - } - - - // just return the selected refs - public void performFinish(IProgressMonitor monitor) throws CoreException { - getTaskModel().putObject(RETURNED_REFERENCES, selected); - } - } - - public static class ShowPossibleManifestEntryContentProvider extends ArrayContentProvider { - private IProject parent, child; - private TaskModel model; - private IVirtualReference[] possible; - public ShowPossibleManifestEntryContentProvider(IProject parent, IProject child, TaskModel taskModel) { - this.parent = parent; - this.child = child; - this.model = taskModel; - } - public Object[] getElements(Object inputElement) { - if( possible == null ) { - IVirtualReference[] current = (IVirtualReference[])model.getObject(CURRENT_REFERENCES); - possible = JavaModuleComponentUtility.findPossibleManifestEntries(parent, child, current); - } - return possible; - } - public void addPossibleReference(IVirtualReference ref) { - ArrayList<IVirtualReference> newRefs = new ArrayList<IVirtualReference>(); - newRefs.addAll(Arrays.asList(possible)); - newRefs.add(ref); - possible = newRefs.toArray(new IVirtualReference[newRefs.size()]); - } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - if (newInput != null) { - possible = null; - viewer.refresh(); - } - } - - } -} diff --git a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/ClasspathContainerRefLabelProvider.java b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/ClasspathContainerRefLabelProvider.java deleted file mode 100644 index 2238a8c8f..000000000 --- a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/ClasspathContainerRefLabelProvider.java +++ /dev/null @@ -1,58 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2009 Red Hat - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Rob Stryker - initial implementation and ongoing maintenance - ******************************************************************************/ -package org.eclipse.jst.common.ui.internal.assembly.wizard; - -import java.net.MalformedURLException; -import java.net.URL; - -import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jst.common.internal.modulecore.ClasspathContainerVirtualComponent; -import org.eclipse.jst.common.ui.internal.JstCommonUIPlugin; -import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.ui.internal.propertypage.IVirtualComponentLabelProvider; - -public class ClasspathContainerRefLabelProvider implements - IVirtualComponentLabelProvider { - - public ClasspathContainerRefLabelProvider() { - // TODO Auto-generated constructor stub - } - - public boolean canHandle(IVirtualComponent component) { - return (component instanceof ClasspathContainerVirtualComponent); - } - - public String getSourceText(IVirtualComponent component) { - return ((ClasspathContainerVirtualComponent)component).getClasspathContainerPath(); - } - - private Image image; - public Image getSourceImage(IVirtualComponent component) { - if( image == null ) { - try { - URL url = new URL( JstCommonUIPlugin.getDefault().getBundle().getEntry("/"), "icons/util-wiz-icon.gif"); //$NON-NLS-1$ //$NON-NLS-2$ - ImageDescriptor imageDescriptor = null; - if (url != null) - imageDescriptor = ImageDescriptor.createFromURL(url); - if( imageDescriptor != null ) - image = imageDescriptor.createImage(); - } catch( MalformedURLException murle ) { - // do nothing - } - } - return image; - } - - public void dispose() { - image.dispose(); - } -} diff --git a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/ExternalJarReferenceWizardFragment.java b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/ExternalJarReferenceWizardFragment.java deleted file mode 100644 index 4e824c24c..000000000 --- a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/ExternalJarReferenceWizardFragment.java +++ /dev/null @@ -1,123 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2009 Red Hat - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Rob Stryker - initial implementation and ongoing maintenance - ******************************************************************************/ -package org.eclipse.jst.common.ui.internal.assembly.wizard; - -import java.util.ArrayList; -import java.util.Iterator; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jst.common.ui.internal.IJstCommonUIConstants; -import org.eclipse.jst.common.ui.internal.IJstCommonUIContextIds; -import org.eclipse.jst.common.ui.internal.JstCommonUIPlugin; -import org.eclipse.jst.common.ui.internal.Messages; -import org.eclipse.swt.SWT; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.FileDialog; -import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualReference; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle; -import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants; - -public class ExternalJarReferenceWizardFragment extends JarReferenceWizardFragment { - public Composite createComposite(Composite parent, IWizardHandle handle) { - Composite c = super.createComposite(parent, handle); - handle.setTitle(Messages.ExternalArchiveTitle); - handle.setDescription(Messages.ExternalArchiveDescription); - PlatformUI.getWorkbench().getHelpSystem().setHelp(c, IJstCommonUIContextIds.DEPLOYMENT_ASSEMBLY_NEW_EXTERNAL_ARCHIVE_REFERENCE_P1); - return c; - } - - protected void buttonPressed() { - selected = chooseExternalArchiveEntries(add.getShell()); - - if(selected != null) { - removeInvalidArchiveFiles(); - - for(IPath path: selected) { - if(!archives.containsKey(path)) { - archives.put(path, path); - } - } - - viewer.refresh(); - if(archives != null && archives.size() > 0) { - isComplete = true; - } else { - isComplete = false; - } - handle.update(); - } - } - - public void performFinish(IProgressMonitor monitor) throws CoreException { - IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(IReferenceWizardConstants.ROOT_COMPONENT); - String runtimeLoc = (String)getTaskModel().getObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION); - if (archives != null && archives.size() > 0) { - ArrayList<IVirtualReference> refList = new ArrayList<IVirtualReference>(); - Iterator iterator = archives.values().iterator(); - while(iterator.hasNext()) { - IPath path = (Path)iterator.next(); - // IPath fullPath = project.getFile(selected[i]).getFullPath(); - String type = VirtualArchiveComponent.LIBARCHIVETYPE - + IPath.SEPARATOR; - IVirtualComponent archive = ComponentCore - .createArchiveComponent(rootComponent.getProject(), - type + path.toString()); - VirtualReference ref = new VirtualReference(rootComponent, archive); - ref.setArchiveName(path.lastSegment()); - if (runtimeLoc != null) { - ref.setRuntimePath(new Path(runtimeLoc).makeAbsolute()); - } - refList.add(ref); - } - IVirtualReference[] finalRefs = refList.toArray(new IVirtualReference[refList.size()]); - getTaskModel().putObject(IReferenceWizardConstants.FINAL_REFERENCE, finalRefs); - } - } - - private static IPath[] chooseExternalArchiveEntries(Shell shell) { - String lastUsedPath= JstCommonUIPlugin.getDefault().getDialogSettings().get(IJstCommonUIConstants.DIALOGSTORE_LASTEXTARCHIVE); - if (lastUsedPath == null) { - lastUsedPath= ""; //$NON-NLS-1$ - } - - FileDialog dialog= new FileDialog(shell, SWT.MULTI); - dialog.setText(Messages.ArchiveDialogNewTitle); - String [] extensions = new String[] {"*.jar;*.war;*.rar;*.zip", "*.*"}; //$NON-NLS-1$//$NON-NLS-2$ - dialog.setFilterExtensions(extensions); - dialog.setFilterPath(lastUsedPath); - - String res= dialog.open(); - if (res == null) { - return null; - } - String[] fileNames= dialog.getFileNames(); - int nChosen= fileNames.length; - - IPath filterPath= Path.fromOSString(dialog.getFilterPath()); - IPath[] elems= new IPath[nChosen]; - for (int i= 0; i < nChosen; i++) { - elems[i]= filterPath.append(fileNames[i]).makeAbsolute(); - } - - JstCommonUIPlugin.getDefault().getDialogSettings().put(IJstCommonUIConstants.DIALOGSTORE_LASTEXTARCHIVE, dialog.getFilterPath()); - - return elems; - } -} diff --git a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/JarReferenceWizardFragment.java b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/JarReferenceWizardFragment.java deleted file mode 100644 index a98cc69e7..000000000 --- a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/JarReferenceWizardFragment.java +++ /dev/null @@ -1,402 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2010 Red Hat and Others - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Rob Stryker - initial implementation and ongoing maintenance - * Konstantin Komissarchik - misc. UI cleanup - ******************************************************************************/ -package org.eclipse.jst.common.ui.internal.assembly.wizard; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.zip.ZipException; -import java.util.zip.ZipFile; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jdt.internal.ui.JavaPlugin; -import org.eclipse.jdt.internal.ui.JavaPluginImages; -import org.eclipse.jdt.internal.ui.viewsupport.FilteredElementTreeSelectionDialog; -import org.eclipse.jdt.internal.ui.wizards.TypedElementSelectionValidator; -import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.layout.GridDataFactory; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerFilter; -import org.eclipse.jface.window.Window; -import org.eclipse.jst.common.ui.internal.IJstCommonUIContextIds; -import org.eclipse.jst.common.ui.internal.JstCommonUIPlugin; -import org.eclipse.jst.common.ui.internal.Messages; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Image; -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.Shell; -import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.model.WorkbenchContentProvider; -import org.eclipse.ui.model.WorkbenchLabelProvider; -import org.eclipse.ui.views.navigator.ResourceComparator; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualReference; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin; -import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle; -import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.WizardFragment; -import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants; - -public class JarReferenceWizardFragment extends WizardFragment { - protected LabelProvider labelProvider = null; - protected ITreeContentProvider contentProvider = null; - protected TreeViewer viewer; - protected Button add, remove; - protected IPath[] paths; - protected IWizardHandle handle; - protected IPath[] selected = new IPath[]{}; - protected Map <IPath, IPath> archives = new HashMap<IPath, IPath>(); - boolean isComplete = false; - - public boolean isComplete() { - return isComplete; - } - - public boolean hasComposite() { - return true; - } - - public Composite createComposite(Composite parent, IWizardHandle handle) { - this.handle = handle; - handle.setTitle(Messages.ArchiveTitle); - handle.setDescription(Messages.ArchiveDescription); - handle.setImageDescriptor(JavaPluginImages.DESC_WIZBAN_ADD_LIBRARY); - - Composite c = new Composite(parent, SWT.NONE); - PlatformUI.getWorkbench().getHelpSystem().setHelp(c, IJstCommonUIContextIds.DEPLOYMENT_ASSEMBLY_NEW_ARCHIVE_REFERENCE_P1); - c.setLayout(new GridLayout(2, false)); - viewer = new TreeViewer(c, SWT.MULTI | SWT.BORDER); - viewer.getTree().setLayoutData(new GridData(GridData.FILL_BOTH)); - viewer.setContentProvider(getContentProvider()); - viewer.setLabelProvider(getLabelProvider()); - viewer.setInput(ResourcesPlugin.getWorkspace()); - - Composite buttonColumn = new Composite(c, SWT.NONE); - buttonColumn.setLayoutData(new GridData(GridData.FILL_VERTICAL)); - - final GridLayout gl = new GridLayout(); - gl.marginWidth = 0; - gl.marginHeight = 0; - - buttonColumn.setLayout( gl ); - - add = new Button(buttonColumn, SWT.NONE); - add.setText(Messages.Add); - GridDataFactory.defaultsFor(add).applyTo(add); - - remove = new Button(buttonColumn, SWT.NONE); - remove.setText(Messages.Remove); - GridDataFactory.defaultsFor(remove).applyTo(remove); - - add.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - buttonPressed(); - } - - public void widgetDefaultSelected(SelectionEvent e) { - widgetSelected(e); - } - }); - - remove.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - removeButtonPressed(); - } - - public void widgetDefaultSelected(SelectionEvent e) { - widgetSelected(e); - } - }); - return c; - } - - protected void buttonPressed() { - IProject project = (IProject)getTaskModel().getObject(IReferenceWizardConstants.PROJECT); - selected = chooseEntries( - add.getShell(), - project.getFullPath()); - - if(selected != null) { - removeInvalidArchiveFiles(); - - for(IPath path: selected) { - if(!archives.containsKey(path)) { - archives.put(path, path); - } - } - - viewer.refresh(); - if(archives != null && archives.size() > 0) { - isComplete = true; - } else { - isComplete = false; - } - handle.update(); - } - } - - protected void removeButtonPressed() { - TreeItem[] toRemove = viewer.getTree().getSelection(); - - if(toRemove != null && toRemove.length > 0) { - for(int i = 0; i < toRemove.length; i++) { - Path path = (Path) toRemove[i].getData(); - if(archives.containsKey(path)) { - archives.remove(path); - } - } - - viewer.refresh(); - if(archives != null && archives.size() > 0) { - isComplete = true; - } else { - isComplete = false; - } - handle.update(); - } - } - - public void performFinish(IProgressMonitor monitor) throws CoreException { - IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(IReferenceWizardConstants.ROOT_COMPONENT); - String runtimeLoc = (String)getTaskModel().getObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION); - if (archives != null && archives.size() > 0) { - ArrayList<IVirtualReference> refList = new ArrayList<IVirtualReference>(); - Iterator iterator = archives.values().iterator(); - while(iterator.hasNext()) { - IPath path = (Path)iterator.next(); - // IPath fullPath = project.getFile(selected[i]).getFullPath(); - String type = VirtualArchiveComponent.LIBARCHIVETYPE - + IPath.SEPARATOR; - IVirtualComponent archive = ComponentCore - .createArchiveComponent(rootComponent.getProject(), - type + path.makeRelative().toString()); - VirtualReference ref = new VirtualReference(rootComponent, archive); - ref.setArchiveName(path.lastSegment()); - if (runtimeLoc != null) { - ref.setRuntimePath(new Path(runtimeLoc).makeAbsolute()); - } - refList.add(ref); - } - IVirtualReference[] finalRefs = refList.toArray(new IVirtualReference[refList.size()]); - getTaskModel().putObject(IReferenceWizardConstants.FINAL_REFERENCE, finalRefs); - } - } - - protected LabelProvider getLabelProvider() { - if (labelProvider == null) { - labelProvider = new LabelProvider() { - public Image getImage(Object element) { - return ModuleCoreUIPlugin.getInstance().getImage("jar_obj"); - } - - public String getText(Object element) { - return element == null ? "" : element.toString();//$NON-NLS-1$ - } - }; - } - return labelProvider; - } - - protected ITreeContentProvider getContentProvider() { - if (contentProvider == null) { - contentProvider = new ITreeContentProvider() { - public Object[] getElements(Object inputElement) { - return archives == null ? new Object[]{} : archives.values().toArray(); - } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - public void dispose() { - } - public boolean hasChildren(Object element) { - return false; - } - public Object getParent(Object element) { - return null; - } - public Object[] getChildren(Object parentElement) { - return null; - } - }; - } - return contentProvider; - } - - private static IPath[] chooseEntries(Shell shell, IPath initialSelection) { - Class[] acceptedClasses= new Class[] { IFile.class }; - TypedElementSelectionValidator validator= new TypedElementSelectionValidator(acceptedClasses, true); - IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot(); - - FilteredElementTreeSelectionDialog dialog = new FilteredElementTreeSelectionDialog(shell, new WorkbenchLabelProvider(), new WorkbenchContentProvider()); - dialog.setHelpAvailable(false); - dialog.setValidator(validator); - dialog.setTitle(Messages.ArchiveDialogNewTitle); - dialog.setMessage(Messages.ArchiveDialogNewDescription); - dialog.addFilter(getDialogViewerFilter()); - dialog.setInput(root); - dialog.setComparator(new ResourceComparator(ResourceComparator.NAME)); - dialog.setInitialFilter("*.jar,*.war,*.rar,*.zip"); //$NON-NLS-1$ - dialog.create(); - - if (dialog.open() == Window.OK) { - Object[] elements= dialog.getResult(); - IPath[] res= new IPath[elements.length]; - for (int i= 0; i < res.length; i++) { - IResource elem= (IResource)elements[i]; - res[i]= elem.getFullPath(); - } - return res; - } - return null; - } - - protected void removeInvalidArchiveFiles(){ - // Tries to open archive to verify it's valid - // If it is not a valid archive, a dialog is shown informing the user of the invalid archives - ArrayList<IPath> invalidArchiveFiles = new ArrayList<IPath>(); - ArrayList<IPath> validArchiveFiles = new ArrayList<IPath>(); - ZipFile zipFile = null; - for(IPath path:selected){ - try { - String osPath = null; - if(path.segmentCount() > 1){ - IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path); - if(file.exists()) { - IPath loc = file.getLocation(); - if(loc != null) { - osPath = loc.toOSString(); - } - } - } - if(osPath == null){ - osPath = path.toOSString(); - } - zipFile = new ZipFile(new File(osPath)); - validArchiveFiles.add(path); - } catch (ZipException e1){ - invalidArchiveFiles.add(path); - } catch (IOException e2){ - invalidArchiveFiles.add(path); - }finally { - if (zipFile != null){ - try { - zipFile.close(); - } catch (IOException e) { - JstCommonUIPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, JstCommonUIPlugin.PLUGIN_ID, e.getMessage(), e)); - } - } - } - } - if(invalidArchiveFiles.size() > 0) { - selected = validArchiveFiles.toArray(new IPath[validArchiveFiles.size()]); - showInvalidArchiveFilesAsWarning(invalidArchiveFiles); - } - } - - private void showInvalidArchiveFilesAsWarning(ArrayList<IPath>invalidArchiveFiles) { - String message = Messages.InvalidArchivesWarning; - boolean first = true; - for(IPath path: invalidArchiveFiles) { - if(!first) { - message += ", \'"; //$NON-NLS-1$ - } else { - message += "\'"; //$NON-NLS-1$ - first = false; - } - message += path.lastSegment() + "\'"; //$NON-NLS-1$ - } - MessageDialog.openWarning(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Messages.WarningTitleDialog, message); - } - - private static ViewerFilter getDialogViewerFilter() { - return new ViewerFilter() { - private final String[] excludedExtensions= { "txt", "css", "dll", "htm", "html", "class", "java", "classpath", //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$//$NON-NLS-5$ //$NON-NLS-6$//$NON-NLS-7$ //$NON-NLS-8$ - "compatibility", "component", "container", "cvsignore", "del", "dnx", //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$//$NON-NLS-5$ //$NON-NLS-6$ - "dtd", "mf", "project", "properties", "psf", "rc", "runtime", "sh", //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$//$NON-NLS-5$ //$NON-NLS-6$//$NON-NLS-7$ //$NON-NLS-8$ - "spec", "sql", "tld", "xmi", "xml", "xsd", "gif", "jpg", "js", "vsd", //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$//$NON-NLS-5$ //$NON-NLS-6$//$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ - "png", "bat", "xsl", "factorypath"}; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ - - private HashMap<String,String> excludedExtensionsMap = null; - - @Override - public boolean select(Viewer viewer, Object parent, Object element) { - if(excludedExtensionsMap == null) { - initializeExludeMap(); - } - if (element instanceof IFile) { - IFile file = (IFile) element; - String ext = file.getFileExtension(); - if(ext != null) { - ext = ext.toLowerCase(); - if(excludedExtensionsMap.get(ext) != null) { - return false; - } - } - return true; - } else if (element instanceof IContainer) { // IProject, IFolder - // ignore closed projects - if (element instanceof IProject && !((IProject)element).isOpen()) - return false; - // ignore .settings folder - if (element instanceof IFolder) { - IFolder folder = (IFolder) element; - if (folder.getName().equals(".settings")) - return false; - } - try { - IResource[] resources= ((IContainer)element).members(); - for (int i= 0; i < resources.length; i++) { - // Only show containers that contain an archive - if (select(viewer, parent, resources[i])) { - return true; - } - } - } catch (CoreException e) { - JavaPlugin.log(e.getStatus()); - } - } - return false; - } - - private void initializeExludeMap() { - excludedExtensionsMap = new HashMap<String, String>(); - for(int i = 0; i < excludedExtensions.length; i++) - excludedExtensionsMap.put(excludedExtensions[i], excludedExtensions[i]); - } - }; - } -} diff --git a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/ManifestModuleDependencyControl.java b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/ManifestModuleDependencyControl.java deleted file mode 100644 index c4e7fc945..000000000 --- a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/ManifestModuleDependencyControl.java +++ /dev/null @@ -1,678 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2010 Red Hat and Others - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Rob Stryker - initial implementation and ongoing maintenance - * Konstantin Komissarchik - misc. UI cleanup - ******************************************************************************/ -package org.eclipse.jst.common.ui.internal.assembly.wizard; - -import java.text.Collator; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jface.layout.GridDataFactory; -import org.eclipse.jface.viewers.BaseLabelProvider; -import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.IBaseLabelProvider; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredContentProvider; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jface.viewers.ViewerComparator; -import org.eclipse.jface.window.Window; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.jst.common.internal.modulecore.util.ArchiveManifest; -import org.eclipse.jst.common.internal.modulecore.util.JavaModuleComponentUtility; -import org.eclipse.jst.common.internal.modulecore.util.ManifestUtilities; -import org.eclipse.jst.common.internal.modulecore.util.UpdateManifestDataModelProperties; -import org.eclipse.jst.common.internal.modulecore.util.UpdateManifestDataModelProvider; -import org.eclipse.jst.common.ui.internal.IJstCommonUIContextIds; -import org.eclipse.jst.common.ui.internal.Messages; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; -import org.eclipse.swt.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.internal.resources.AbstractResourceListVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFile; -import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -import org.eclipse.wst.common.componentcore.ui.ModuleCoreUIPlugin; -import org.eclipse.wst.common.componentcore.ui.internal.propertypage.DependencyPageExtensionManager; -import org.eclipse.wst.common.componentcore.ui.internal.propertypage.IVirtualComponentLabelProvider; -import org.eclipse.wst.common.componentcore.ui.propertypage.AbstractIModuleDependenciesControl; -import org.eclipse.wst.common.componentcore.ui.propertypage.ModuleAssemblyRootPage; -import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; - -public class ManifestModuleDependencyControl extends AbstractIModuleDependenciesControl { - - protected IProject project; - protected IVirtualComponent rootComponent; - protected IProject parentProject; - protected ModuleAssemblyRootPage propPage; - protected Button addButton, removeButton, moveUpButton, moveDownButton; - protected Combo parentSelection; - protected TableViewer manifestEntryViewer; - private ArrayList<IVirtualReference> list = new ArrayList<IVirtualReference>(); - private String previousManifest = null; - - public ManifestModuleDependencyControl(final IProject project, - final ModuleAssemblyRootPage page) { - this.project = project; - this.propPage = page; - rootComponent = ComponentCore.createComponent(project); - } - - private static GridLayout glayout( final int columns ) - { - final GridLayout gl = new GridLayout( columns, false ); - gl.marginWidth = 0; - gl.marginHeight = 0; - - return gl; - } - - public Composite createContents(Composite parent) { - Composite root = new Composite(parent, SWT.NONE); - PlatformUI.getWorkbench().getHelpSystem().setHelp(root, IJstCommonUIContextIds.DEPLOYMENT_ASSEMBLY_PREFERENCE_PAGE_MANIFEST_ENTRIES_TAB); - root.setLayout(glayout(1)); - - final Composite parentSelectionComposite = new Composite( root, SWT.NONE ); - parentSelectionComposite.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) ); - parentSelectionComposite.setLayout( glayout( 2 ) ); - - Label l = new Label(parentSelectionComposite, SWT.NONE); - l.setText(Messages.ParentProject); - l.setLayoutData(new GridData()); - - parentSelection = new Combo(parentSelectionComposite, SWT.READ_ONLY); - parentSelection.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - parentSelection.setItems(getPossibleParentProjects()); - parentSelection.addModifyListener(new ModifyListener(){ - public void modifyText(ModifyEvent e) { - refreshViewerFromNewParentProject(); - } - }); - - final Composite manifestEntryViewerComposite = new Composite( root, SWT.NONE ); - final GridData manifestEntryViewerCompositeLayoutData = new GridData( GridData.FILL_BOTH ); - manifestEntryViewerComposite.setLayoutData( manifestEntryViewerCompositeLayoutData ); - manifestEntryViewerComposite.setLayout( glayout( 2 ) ); - - manifestEntryViewer = createManifestReferenceTableViewer(manifestEntryViewerComposite, SWT.SINGLE); - GridData data = new GridData(GridData.FILL_BOTH); - int numlines = Math.min(10, manifestEntryViewer.getTable().getItemCount()); - data.heightHint = manifestEntryViewer.getTable().getItemHeight() * numlines; - manifestEntryViewer.getTable().setLayoutData(data); - - Composite buttonColumn = new Composite(manifestEntryViewerComposite, SWT.NONE); - buttonColumn.setLayoutData(new GridData(GridData.FILL_VERTICAL)); - buttonColumn.setLayout(glayout( 1 )); - - addButton = new Button(buttonColumn, SWT.PUSH); - addButton.setText(Messages.Add); - GridDataFactory.defaultsFor(addButton).applyTo(addButton); - - removeButton = new Button(buttonColumn, SWT.PUSH); - removeButton.setText(Messages.Remove); - GridDataFactory.defaultsFor(removeButton).applyTo(removeButton); - - moveUpButton = new Button(buttonColumn, SWT.PUSH); - moveUpButton.setText(Messages.MoveUp); - GridDataFactory.defaultsFor(moveUpButton).applyTo(moveUpButton); - - moveDownButton = new Button(buttonColumn, SWT.PUSH); - moveDownButton.setText(Messages.MoveDown); - GridDataFactory.defaultsFor(moveDownButton).applyTo(moveDownButton); - - IFile manifest = getManifestIFile(rootComponent); - if(manifest == null) { - addButton.setEnabled(false); - } else { - addButton.setEnabled(true); - previousManifest = manifest.getFullPath().toOSString(); - } - removeButton.setEnabled(false); - moveUpButton.setEnabled(false); - moveDownButton.setEnabled(false); - - addButton.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - addPressed(); - } - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - removeButton.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - removePressed(); - } - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - moveUpButton.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - moveUp(); - } - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - moveDownButton.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - moveDown(); - } - public void widgetDefaultSelected(SelectionEvent e) { - } - }); - - manifestEntryViewer.setLabelProvider(new ManifestLabelProvider()); - manifestEntryViewer.setContentProvider(new ManifestContentProvider()); - manifestEntryViewer.setInput(ResourcesPlugin.getWorkspace()); - parentSelection.select(0); - - manifestEntryViewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - viewerSelectionChanged(); - } - }); - - //ensure the buttons are properly updated when table sort mode toggled - manifestEntryViewer.getTable().getColumn(0).addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - updateButtons(); - } - - public void widgetDefaultSelected(SelectionEvent e) { - // do nothing - } - }); - - //ensure the buttons are properly updated when table sort mode toggled - manifestEntryViewer.getTable().getColumn(1).addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - updateButtons(); - } - - public void widgetDefaultSelected(SelectionEvent e) { - //do nothing - } - }); - return root; - } - - protected void viewerSelectionChanged() { - updateButtons(); - } - - protected void updateButtons() { - if(!addButton.isEnabled()) { - removeButton.setEnabled(false); - moveUpButton.setEnabled(false); - moveDownButton.setEnabled(false); - } else { - int index = manifestEntryViewer.getTable().getSelectionIndex(); - int size = manifestEntryViewer.getTable().getItems().length; - boolean sorted = manifestEntryViewer.getTable().getSortDirection() != SWT.NONE; - removeButton.setEnabled(index != -1); - moveUpButton.setEnabled(index != -1 && index != 0 && !sorted); - moveDownButton.setEnabled(index != -1 && index != size-1 && !sorted); - } - } - - protected void moveUp() { - int index = manifestEntryViewer.getTable().getSelectionIndex(); - IVirtualReference ref = list.remove(index); - list.add(index-1,ref); - refreshViewer(); - updateButtons(); - } - protected void moveDown() { - int index = manifestEntryViewer.getTable().getSelectionIndex(); - IVirtualReference ref = list.remove(index); - list.add(index+1,ref); - refreshViewer(); - updateButtons(); - } - - protected void addPressed() { - AddManifestEntryTaskWizard wizard = new AddManifestEntryTaskWizard(); - wizard.getTaskModel().putObject(AddManifestEntryTaskWizard.CHILD_PROJECT, project); - wizard.getTaskModel().putObject(AddManifestEntryTaskWizard.PARENT_PROJECT, parentProject); - wizard.getTaskModel().putObject(AddManifestEntryTaskWizard.CURRENT_REFERENCES, list.toArray(new IVirtualReference[list.size()])); - WizardDialog wd = new WizardDialog(addButton.getShell(), wizard); - if( wd.open() != Window.CANCEL) { - IVirtualReference[] ret = (IVirtualReference[])wizard.getTaskModel().getObject(AddManifestEntryTaskWizard.RETURNED_REFERENCES); - if (ret != null) - list.addAll(Arrays.asList(ret)); - refreshViewer(); - updateButtons(); - } - } - - protected void removePressed() { - IStructuredSelection sel = (IStructuredSelection)manifestEntryViewer.getSelection(); - Iterator i = sel.iterator(); - while(i.hasNext()) { - list.remove(i.next()); - } - refreshViewer(); - updateButtons(); - } - - public static class ManifestLabelProvider extends BaseLabelProvider implements ITableLabelProvider { - private IVirtualComponentLabelProvider[] delegates; - protected void getDelegates() { - if( delegates == null ) - delegates = DependencyPageExtensionManager.loadDelegates(); - } - public Image getColumnImage(Object element, int columnIndex) { - getDelegates(); - if( columnIndex == 1 ) { - if( element instanceof IVirtualReference ) { - for( int i = 0; i < delegates.length; i++ ) - if( delegates[i].canHandle(((IVirtualReference)element).getReferencedComponent())) - return delegates[i].getSourceImage(((IVirtualReference)element).getReferencedComponent()); - } - } - return ModuleCoreUIPlugin.getInstance().getImage("jar_obj"); - } - - public String getColumnText(Object element, int columnIndex) { - if( element instanceof IVirtualReference ) { - IVirtualReference ref = (IVirtualReference)element; - if( columnIndex == 0 && ref.getArchiveName() != null) { - if(ref.getRuntimePath().toString().length() > 0) - return ref.getRuntimePath().append(ref.getArchiveName()).toString(); - else - return ref.getArchiveName(); - } - if( columnIndex == 1 ) - return handleSourceText(ref.getReferencedComponent()); - } - return null; - } - - private String handleSourceText(IVirtualComponent component) { - getDelegates(); - for( int i = 0; i < delegates.length; i++ ) - if( delegates[i].canHandle(component)) - return delegates[i].getSourceText(component); - - // default impl - if( component.isBinary() ) { - IPath p = component.getAdapter(IPath.class); - return p == null ? null : p.toString(); - } - return component.getProject().getName(); - } - } - - - private class ManifestContentProvider implements IStructuredContentProvider { - public void dispose() { - } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - public Object[] getElements(Object inputElement) { - return refsForCurrentProject == null ? new Object[]{} : refsForCurrentProject; - } - } - - /** - * Provides three possible sorts for each column based on the text labels. - * First click on any column will enable forward sorting for that column, - * second click on a column will enable backwards sorting, and third click - * will disable sorting. - * @author jsholl - */ - private static class TableViewerColumnSortToggler { - private int sortDirection = 0; - private int sortColumn = 0; - private TableViewer tableViewer; - - private TableViewerColumnSortToggler(TableViewer tableViewer){ - this.tableViewer = tableViewer; - } - - private void toggleSort(int column){ - if(sortColumn == column){ - //cycle through sort options - switch(sortDirection){ - case SWT.NONE: - sortDirection = SWT.UP; - break; - case SWT.UP: - sortDirection = SWT.DOWN; - break; - case SWT.DOWN: - sortDirection = SWT.NONE; - break; - } - } else { - //clicked on a different column reset cycle - sortColumn = column; - sortDirection = SWT.UP; - } - - ViewerComparator comparator = getViewerComparator(column, sortDirection); - tableViewer.setComparator(comparator); - - Table table = tableViewer.getTable(); - TableColumn sortColumn = tableViewer.getTable().getColumn(column); - table.setSortColumn(sortColumn); - table.setSortDirection(sortDirection); - } - - private ViewerComparator getViewerComparator(final int columnIndex, final int sortDirection) { - if(sortDirection == SWT.NONE){ - return null; - } - return new ViewerComparator() { - Collator collator = Collator.getInstance(); - public int compare(Viewer viewerLocal, Object e1, Object e2) { - IBaseLabelProvider baseLabelProvider = tableViewer.getLabelProvider(); - if(baseLabelProvider instanceof ITableLabelProvider){ - ITableLabelProvider tableLabelProvider = (ITableLabelProvider)baseLabelProvider; - String text1 = tableLabelProvider.getColumnText(e1, columnIndex); - if(text1 != null){ - String text2 = tableLabelProvider.getColumnText(e2, columnIndex); - int comp = collator.compare(text1, text2); - if(sortDirection == SWT.DOWN){ - comp = -comp; - } - return comp; - } - } - return 0; - } - }; - } - }; - - public static TableViewer createManifestReferenceTableViewer(Composite parent, int style) { - int flags = SWT.BORDER | style; - - Table table = new Table(parent, flags); - TableViewer viewer = new TableViewer(table); - final TableViewerColumnSortToggler sortController = new TableViewerColumnSortToggler(viewer); - - // set up table layout - TableLayout tableLayout = new org.eclipse.jface.viewers.TableLayout(); - tableLayout.addColumnData(new ColumnWeightData(200, true)); - tableLayout.addColumnData(new ColumnWeightData(200, true)); - table.setLayout(tableLayout); - table.setHeaderVisible(true); - table.setLinesVisible(true); - - // table columns - TableColumn fileNameColumn = new TableColumn(table, SWT.NONE, 0); - fileNameColumn.setText(Messages.ManifestEntryColumn); - fileNameColumn.setResizable(true); - fileNameColumn.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - sortController.toggleSort(0); - } - public void widgetDefaultSelected(SelectionEvent e) { - //do nothing - } - }); - - TableColumn projectColumn = new TableColumn(table, SWT.NONE, 1); - projectColumn.setText(Messages.ManifestEntrySourceColumn); - projectColumn.setResizable(true); - projectColumn.addSelectionListener(new SelectionListener() { - public void widgetSelected(SelectionEvent e) { - sortController.toggleSort(1); - } - public void widgetDefaultSelected(SelectionEvent e) { - //do nothing - } - }); - - tableLayout.layout(table, true); - return viewer; - } - - private IVirtualReference[] refsForCurrentProject; - protected void refreshViewerFromNewParentProject() { - list.clear(); - String parentString = parentSelection.getText(); - refsForCurrentProject = new IVirtualReference[]{}; - if( parentString != null && !"".equals(parentString)) { //$NON-NLS-1$ - parentProject = ResourcesPlugin.getWorkspace().getRoot().getProject(parentString); - IVirtualReference[] current = JavaModuleComponentUtility.findCurrentManifestEntries(parentProject, project); - refsForCurrentProject = sortRefsForCurrentProject(addMissingDummyEntries(current)); - for( int i = 0; i < refsForCurrentProject.length; i++ ) { - list.add(refsForCurrentProject[i]); - } - } - manifestEntryViewer.refresh(); - } - - private IVirtualReference[] sortRefsForCurrentProject(IVirtualReference[] currentRefs) { - IFile manifestFile = getManifestIFile(rootComponent); - if (manifestFile == null) - return currentRefs; - - HashMap<String, IVirtualReference> unsortedRefMap = new HashMap<String, IVirtualReference>(); - for (int i = 0; i < currentRefs.length; i++) { - IVirtualReference ref = currentRefs[i]; - String entryName; - if(ref.getRuntimePath().toString().length() > 0) - entryName = ref.getRuntimePath().append(ref.getArchiveName()).toString(); - else - entryName = ref.getArchiveName(); - unsortedRefMap.put(entryName, ref); - } - List<IVirtualReference> sortedRefs = new ArrayList<IVirtualReference>(); - ArchiveManifest manifest = ManifestUtilities.getManifest(manifestFile); - String[] entries = manifest.getClassPathTokenized(); - for (int i = 0; i < entries.length; i++) { - IVirtualReference ref = unsortedRefMap.get(entries[i]); - if (ref != null) { - sortedRefs.add(ref); - } - } - return sortedRefs.toArray(new IVirtualReference[sortedRefs.size()]); - } - - protected void refreshViewer() { - refsForCurrentProject = list.toArray(new IVirtualReference[list.size()]); - GridData data = new GridData(GridData.FILL_BOTH); - int numlines = Math.min(10, manifestEntryViewer.getTable().getItemCount()); - data.heightHint = manifestEntryViewer.getTable().getItemHeight() * numlines; - manifestEntryViewer.getTable().setLayoutData(data); - manifestEntryViewer.refresh(); - } - - protected IVirtualReference[] addMissingDummyEntries(IVirtualReference[] current) { - IFile manifestFile = getManifestIFile(rootComponent); - if( manifestFile != null ) { - ArrayList<IVirtualReference> refs = new ArrayList<IVirtualReference>(); - refs.addAll(Arrays.asList(current)); - ArchiveManifest manifest = ManifestUtilities.getManifest(manifestFile); - String[] entries = manifest.getClassPathTokenized(); - String[] unusedEntries = findUnusedEntries(current, entries); - for( int i = 0; i < unusedEntries.length; i++ ) { - refs.add(createDummyReference(unusedEntries[i])); - } - return refs.toArray(new IVirtualReference[refs.size()]); - } - return current; - } - - - public static class DummyVirtualComponent extends AbstractResourceListVirtualComponent { - private static final String DUMMY_FIRST_SEGMENT = "dummyVirtualComponent"; //$NON-NLS-1$ - public DummyVirtualComponent(IProject p, IVirtualComponent referencingComponent) { - super(p, referencingComponent); - } - - protected String getFirstIdSegment() { - return DUMMY_FIRST_SEGMENT; - } - - protected IContainer[] getUnderlyingContainers() { - return new IContainer[]{}; - } - - protected IResource[] getLooseResources() { - return new IResource[]{}; - } - } - - private IVirtualReference createDummyReference(String path) { - return createDummyReference(path, parentProject, ComponentCore.createComponent(parentProject)); - } - - public static IVirtualReference createDummyReference(String path, IProject project, IVirtualComponent rootComponent) { - IVirtualComponent comp = new DummyVirtualComponent(project, rootComponent); - IVirtualReference ref = ComponentCore.createReference(rootComponent, comp); - if(path.indexOf("\\") > 0) { - ref.setRuntimePath(new Path("")); - ref.setArchiveName(path); - return ref; - } - IPath path2 = new Path(path.trim()); - IPath runtimePath = path2.segmentCount() > 1 ? path2.removeLastSegments(1) : new Path("/"); //$NON-NLS-1$ - runtimePath = runtimePath.makeRelative(); - ref.setRuntimePath(runtimePath); - ref.setArchiveName(path2.lastSegment()); - return ref; - } - - private String[] findUnusedEntries(IVirtualReference[] current, String[] entries) { - ArrayList<String> list = new ArrayList<String>(); - list.addAll(Arrays.asList(entries)); - for( int i = 0; i < current.length; i++ ) { - String currentEntry = current[i].getRuntimePath().append(current[i].getArchiveName()).toString(); - list.remove(currentEntry); - } - return list.toArray(new String[list.size()]); - } - - /** - * Clients who find this unacceptable should override - * @param root - * @return - */ - public IFile getManifestIFile(IVirtualComponent root) { - IVirtualFolder rootFolder = root.getRootFolder(); - IVirtualFile vf = rootFolder.getFile(new Path("META-INF/MANIFEST.MF")); - if( vf.exists() ) - return vf.getUnderlyingFile(); - return null; - } - - protected String[] getPossibleParentProjects() { - IProject[] projects = JavaModuleComponentUtility.findParentProjects(project); - String[] strings = new String[projects.length]; - for( int i = 0; i < projects.length; i++ ) { - strings[i] = projects[i].getName(); - } - return strings; - } - - - public boolean performOk() { - if(addButton != null && addButton.isEnabled()) { - IDataModel updateManifestDataModel = DataModelFactory.createDataModel(new UpdateManifestDataModelProvider()); - updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, project.getName()); - updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false); - updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, getManifestIFile(rootComponent)); - ArrayList<String> asStrings = new ArrayList<String>(); - Iterator<IVirtualReference> i = list.iterator(); - IVirtualReference tmp; - while(i.hasNext()) { - tmp = i.next(); - if(tmp.getArchiveName() != null) { - if(tmp.getRuntimePath().toString().length() > 0 ) - asStrings.add(tmp.getRuntimePath().append(tmp.getArchiveName()).toString()); - else - asStrings.add(tmp.getArchiveName()); - } - } - updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, asStrings); - try { - updateManifestDataModel.getDefaultOperation().execute(new NullProgressMonitor(), null ); - } catch (ExecutionException e) { - // TODO log J2EEUIPlugin.logError(e); - } - } - - return true; - } - - public void performDefaults() { - refreshViewerFromNewParentProject(); - } - - public boolean performCancel() { - return true;//false; Not sure why this value was on false, and ModuleAssemblyRootPage was set on true - //Problem seems to be corrected, but need to verify there is not new derived problems . - } - - public void setVisible(boolean visible) { - } - - public void dispose() { - } - - public void performApply() { - IFile manifest = getManifestIFile(rootComponent); - if(manifest == null) { - previousManifest = null; - addButton.setEnabled(false); - performDefaults(); - } else { - if(previousManifest == null) { - performDefaults(); - } else { - String currentManifest = manifest.getFullPath().toOSString(); - if(!previousManifest.equals(currentManifest)) { - performDefaults(); - } - } - previousManifest = manifest.getFullPath().toOSString(); - addButton.setEnabled(true); - - } - updateButtons(); - performOk(); - } - -} diff --git a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/VariableReferenceWizardFragment.java b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/VariableReferenceWizardFragment.java deleted file mode 100644 index 283cdcccd..000000000 --- a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/assembly/wizard/VariableReferenceWizardFragment.java +++ /dev/null @@ -1,300 +0,0 @@ -/****************************************************************************** - * Copyright (c) 2010 Red Hat and Others - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Rob Stryker - initial implementation and ongoing maintenance - * Konstantin Komissarchik - misc. UI cleanup - ******************************************************************************/ - -package org.eclipse.jst.common.ui.internal.assembly.wizard; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.zip.ZipException; -import java.util.zip.ZipFile; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.internal.ui.JavaPluginImages; -import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPVariableElement; -import org.eclipse.jdt.internal.ui.wizards.buildpaths.CPVariableElementLabelProvider; -import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.ITreeContentProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jst.common.ui.internal.IJstCommonUIContextIds; -import org.eclipse.jst.common.ui.internal.JstCommonUIPlugin; -import org.eclipse.jst.common.ui.internal.Messages; -import org.eclipse.swt.SWT; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.layout.FormAttachment; -import org.eclipse.swt.layout.FormData; -import org.eclipse.swt.layout.FormLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent; -import org.eclipse.wst.common.componentcore.internal.resources.VirtualReference; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle; -import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.WizardFragment; -import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants; - -public class VariableReferenceWizardFragment extends WizardFragment { - protected LabelProvider labelProvider = null; - protected ITreeContentProvider contentProvider = null; - protected TreeViewer viewer; - protected IPath[] paths; - protected IWizardHandle handle; - protected Object selected = null; - boolean isComplete = false; - - public boolean isComplete() { - return isComplete; - } - - public boolean hasComposite() { - return true; - } - - @Override - public Composite createComposite(Composite parent, IWizardHandle handle) { - this.handle = handle; - handle.setTitle(Messages.VariableReferenceTitle); - handle.setDescription(Messages.VariableReferenceDescription); - handle.setImageDescriptor(JavaPluginImages.DESC_WIZBAN_ADD_LIBRARY); - - Composite c = new Composite(parent, SWT.NONE); - PlatformUI.getWorkbench().getHelpSystem().setHelp(c, IJstCommonUIContextIds.DEPLOYMENT_ASSEMBLY_NEW_VARIABLE_REFERENCE_P1); - c.setLayout(new FormLayout()); - viewer = new TreeViewer(c, SWT.SINGLE | SWT.BORDER); - viewer.setContentProvider(getContentProvider()); - viewer.setLabelProvider(getLabelProvider()); - viewer.setInput(ResourcesPlugin.getWorkspace()); - viewer.addSelectionChangedListener(new ISelectionChangedListener() { - public void selectionChanged(SelectionChangedEvent event) { - handleNewSelection(); - } - }); - FormData fd = new FormData(); - fd.width = 390; - fd.height = 185; - fd.left = new FormAttachment(0, 5); - fd.top = new FormAttachment(0, 5); - fd.right = new FormAttachment(100, -5); - fd.bottom = new FormAttachment(100, -5); - viewer.getTree().setLayoutData(fd); - return c; - } - - protected void handleNewSelection() { - isComplete = true; - IStructuredSelection sel = (IStructuredSelection)viewer.getSelection(); - Object o = sel.getFirstElement(); - if( o == null ) { - isComplete = false; - selected = null; - } else { - selected = o; - IPath p = null; - if( o instanceof CPVariableElement) { - p = ((CPVariableElement)o).getPath(); - } else if( o instanceof ExtendedVariable) { - p = ((ExtendedVariable)o).element.getPath().append(((ExtendedVariable)o).pathAfterElement); - } - if(p == null || p.isEmpty() || p.toFile().isDirectory() || !isValidArchive(p)) { - isComplete = false; - } - } - handle.update(); - } - - protected LabelProvider getLabelProvider() { - if (labelProvider == null) { - labelProvider= new VariablesLabelProvider(); - } - return labelProvider; - } - - public static class VariablesLabelProvider extends LabelProvider { - private CPVariableElementLabelProvider delegate = new CPVariableElementLabelProvider(false); - public Image getImage(Object element) { - if( element instanceof CPVariableElement) - return delegate.getImage(element); - if( element instanceof ExtendedVariable) { - if(((ExtendedVariable)element).isFolder()) - return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FOLDER); - return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_FILE); - } - return null; - } - public String getText(Object element) { - if( element instanceof CPVariableElement) - return delegate.getText(element); - if( element instanceof ExtendedVariable) - return ((ExtendedVariable)element).pathAfterElement.lastSegment(); - return element == null ? "" : element.toString();//$NON-NLS-1$ - } - } - - public static class ExtendedVariable { - public CPVariableElement element; - public IPath pathAfterElement; - public ExtendedVariable(CPVariableElement e, IPath p) { - element = e; - pathAfterElement = p; - } - public boolean isFolder() { - return element.getPath().append(pathAfterElement).toFile().isDirectory(); - } - } - - private CPVariableElement[] elements; - private CPVariableElement[] initializeElements() { - String[] entries= JavaCore.getClasspathVariableNames(); - ArrayList elements= new ArrayList(entries.length); - for (int i= 0; i < entries.length; i++) { - String name= entries[i]; - IPath entryPath= JavaCore.getClasspathVariable(name); - if (entryPath != null) { - elements.add(new CPVariableElement(name, entryPath)); - } - } - return (CPVariableElement[]) elements.toArray(new CPVariableElement[elements.size()]); - } - - - protected ITreeContentProvider getContentProvider() { - if (contentProvider == null) { - contentProvider = new ITreeContentProvider() { - public Object[] getElements(Object inputElement) { - if( elements == null ) - elements = initializeElements(); - return elements; - } - public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { - } - public void dispose() { - } - public boolean hasChildren(Object element) { - return getChildren(element).length > 0; - } - public Object getParent(Object element) { - return null; - } - public Object[] getChildren(Object parentElement) { - if( parentElement instanceof CPVariableElement) { - if(((CPVariableElement)parentElement).getPath().toFile().isDirectory()) { - String[] names = ((CPVariableElement)parentElement).getPath().toFile().list(); - ExtendedVariable[] extensions = new ExtendedVariable[names.length]; - for( int i = 0; i < extensions.length; i++ ) - extensions[i] = new ExtendedVariable((CPVariableElement)parentElement, new Path(names[i])); - return extensions; - } - } - if( parentElement instanceof ExtendedVariable) { - ExtendedVariable p1 = (ExtendedVariable)parentElement; - IPath parentLoc = p1.element.getPath(); - parentLoc = parentLoc.append(p1.pathAfterElement); - String[] names = parentLoc.toFile().list(); - if( names != null ) { - ExtendedVariable[] extensions = new ExtendedVariable[names.length]; - for( int i = 0; i < extensions.length; i++ ) - extensions[i] = new ExtendedVariable(p1.element, p1.pathAfterElement.append(names[i])); - return extensions; - } - } - return new Object[]{}; - } - }; - } - return contentProvider; - } - - public void performFinish(IProgressMonitor monitor) throws CoreException { - IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(IReferenceWizardConstants.ROOT_COMPONENT); - String runtimeLoc = (String)getTaskModel().getObject(IReferenceWizardConstants.DEFAULT_LIBRARY_LOCATION); - if (selected != null ) { - ArrayList<IVirtualReference> refList = new ArrayList<IVirtualReference>(); -// for (int i = 0; i < selected.length; i++) { - IPath variablePath = getVariablePath(selected); - IPath resolvedPath = JavaCore.getResolvedVariablePath(variablePath); - java.io.File file = new java.io.File(resolvedPath.toOSString()); - if (file.isFile() && file.exists()) { - String type = VirtualArchiveComponent.VARARCHIVETYPE - + IPath.SEPARATOR; - IVirtualComponent archive = ComponentCore - .createArchiveComponent(rootComponent.getProject(), - type + variablePath.toString()); - VirtualReference ref = new VirtualReference(rootComponent, archive); - ref.setArchiveName(resolvedPath.lastSegment()); - if (runtimeLoc != null) { - ref.setRuntimePath(new Path(runtimeLoc).makeAbsolute()); - } - refList.add(ref); - } -// } - IVirtualReference[] finalRefs = refList.toArray(new IVirtualReference[refList.size()]); - getTaskModel().putObject(IReferenceWizardConstants.FINAL_REFERENCE, finalRefs); - } - } - - private IPath getVariablePath(Object selected) { - if( selected instanceof ExtendedVariable) { - ExtendedVariable s1 = (ExtendedVariable)selected; - return new Path(s1.element.getName()).append(s1.pathAfterElement); - } - return new Path(((CPVariableElement)selected).getName()); - } - - private boolean isValidArchive(IPath path) { - boolean valid = true; - ZipFile zipFile = null; - try { - String osPath = null; - if(path.segmentCount() > 1){ - IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path); - if(file.exists()) { - IPath loc = file.getLocation(); - if(loc != null) { - osPath = loc.toOSString(); - } - } - } - if(osPath == null){ - osPath = path.toOSString(); - } - zipFile = new ZipFile(new File(osPath)); - } catch (ZipException e1){ - valid = false; - } catch (IOException e2){ - valid = false; - }finally { - if (zipFile != null){ - try { - zipFile.close(); - } catch (IOException e) { - JstCommonUIPlugin.getDefault().getLog().log(new Status(IStatus.ERROR, JstCommonUIPlugin.PLUGIN_ID, e.getMessage(), e)); - } - } - } - return valid; - } -} diff --git a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/messages.properties b/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/messages.properties deleted file mode 100644 index 70e7a3613..000000000 --- a/plugins/org.eclipse.jst.common.ui/src/org/eclipse/jst/common/ui/internal/messages.properties +++ /dev/null @@ -1,22 +0,0 @@ -ArchiveTitle=Archives from Workspace -ArchiveDescription=Select archives to include in the deployment assembly. -ArchiveDialogNewTitle=Archive Selection -ArchiveDialogNewDescription=&Select archives to include in the deployment assembly: -ExternalArchiveTitle=Archives from File System -ExternalArchiveDescription=Select archives to include in the deployment assembly. -Browse=Br&owse... -VariableReferenceTitle=Archive via Path Variable -VariableReferenceDescription=Select archive to include in the deployment assembly. -AddManifestEntryTaskWizardTitle=Add Manifest Entries -AddManifestEntryTaskWizardDesc=Add manifest entries that should be accessible at runtime. -ParentProject=&Parent project: -CustomEntryButton=&Add Custom Entry -Add=A&dd... -Remove=&Remove -MoveUp=Move &Up -MoveDown=Move Do&wn -ManifestEntryColumn=Manifest Entry -ManifestEntrySourceColumn=Source -ConfigureParentLink=Configure available manifest entries... -InvalidArchivesWarning=The following files were not added because they are not archive files or are corrupted: -WarningTitleDialog=Warning
\ No newline at end of file diff --git a/plugins/pom.xml b/plugins/pom.xml index eb6a04679..09fd5d1d2 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -15,7 +15,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs <module>org.eclipse.jst.common.fproj.enablement.jdt.sdk</module> <module>org.eclipse.jst.common.project.facet.core</module> <module>org.eclipse.jst.common.project.facet.ui</module> - <module>org.eclipse.jst.common.ui</module> <module>org.eclipse.wst.common.core</module> <module>org.eclipse.wst.common.emf</module> <module>org.eclipse.wst.common.emfworkbench.integration</module> |