[jbosstools-commits] JBoss Tools SVN: r37181 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal: ui and 4 other directories.

Author: adietish Date: 2011-12-09 11:54:52 -0500 (Fri, 09 Dec 2011) New Revision: 37181 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/ImportFailedException.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIException.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/WontOverwriteException.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/FileUtils.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ImageRepository.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java Removed: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/utils/ Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftImages.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleUtils.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/Logger.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/UIUtils.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/PassphraseDialog.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AddToExistingProjectStrategy.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProjectStrategy.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java Log: cleaned package structure Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/ImportFailedException.java (from rev 37167, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/ImportFailedException.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/ImportFailedException.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/ImportFailedException.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -0,0 +1,20 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.ui; + +public class ImportFailedException extends OpenShiftUIException { + + private static final long serialVersionUID = 1L; + + public ImportFailedException(String message, Object... arguments) { + super(message, arguments); + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/ImportFailedException.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftImages.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftImages.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftImages.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -12,7 +12,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; -import org.jboss.tools.openshift.express.internal.ui.common.ImageRepository; +import org.jboss.tools.openshift.express.internal.ui.utils.ImageRepository; public class OpenShiftImages { Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIException.java (from rev 37167, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/OpenShiftUIException.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIException.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIException.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.ui; + +import org.jboss.tools.openshift.express.client.OpenShiftException; + +public class OpenShiftUIException extends OpenShiftException { + + private static final long serialVersionUID = 1L; + + public OpenShiftUIException(String message, Object... arguments) { + super(message, arguments); + } + + public OpenShiftUIException(Throwable cause, String message, Object... arguments) { + super(cause, message, arguments); + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIException.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/WontOverwriteException.java (from rev 37167, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/WontOverwriteException.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/WontOverwriteException.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/WontOverwriteException.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -0,0 +1,20 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.ui; + +public class WontOverwriteException extends OpenShiftUIException { + + private static final long serialVersionUID = 1L; + + public WontOverwriteException(String message, Object... arguments) { + super(message, arguments); + } +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/WontOverwriteException.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleUtils.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleUtils.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleUtils.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -22,7 +22,7 @@ import org.eclipse.ui.console.IConsoleManager; import org.eclipse.ui.console.IConsoleView; import org.eclipse.ui.console.MessageConsole; -import org.jboss.tools.openshift.express.internal.utils.Logger; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; /** * A utility class to manager the message consoles creations and retrivals Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogAction.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -29,7 +29,7 @@ import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; import org.jboss.tools.openshift.express.internal.ui.console.TailServerLogWorker.JschToEclipseLogger; import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; -import org.jboss.tools.openshift.express.internal.utils.Logger; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import com.jcraft.jsch.JSch; import com.jcraft.jsch.JSchException; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -54,7 +54,7 @@ console.newMessageStream().println(line); } } catch (Throwable e) { - org.jboss.tools.openshift.express.internal.utils.Logger.error( + org.jboss.tools.openshift.express.internal.ui.utils.Logger.error( "Error while receiving the remote server log", e); } finally { @@ -99,14 +99,14 @@ switch (level) { case DEBUG: case INFO: - org.jboss.tools.openshift.express.internal.utils.Logger.debug(message); + org.jboss.tools.openshift.express.internal.ui.utils.Logger.debug(message); break; case WARN: - org.jboss.tools.openshift.express.internal.utils.Logger.warn(message); + org.jboss.tools.openshift.express.internal.ui.utils.Logger.warn(message); break; case ERROR: case FATAL: - org.jboss.tools.openshift.express.internal.utils.Logger.error(message); + org.jboss.tools.openshift.express.internal.ui.utils.Logger.error(message); break; } } Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/FileUtils.java (from rev 37146, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/FileUtils.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/FileUtils.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/FileUtils.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -0,0 +1,191 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.ui.utils; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +import org.eclipse.core.runtime.Assert; + +/** + * @author André Dietisheim + */ +public class FileUtils { + + private static final byte[] buffer = new byte[1024]; + + public static boolean canRead(String path) { + if (path == null) { + return false; + } + return canRead(new File(path)); + } + + public static boolean canRead(File file) { + if (file == null) { + return false; + } + return file.canRead(); + } + + public static boolean exists(File file) { + return file != null + && file.exists(); + } + + public static boolean isDirectory(File file) { + return file != null + && file.isDirectory(); + } + + public static File getSystemTmpFolder() { + String tmpFolder = System.getProperty("java.io.tmpdir"); + return new File(tmpFolder); + } + + public static File getRandomTmpFolder() { + String randomName = String.valueOf(System.currentTimeMillis()); + return new File(getSystemTmpFolder(), randomName); + } + + /** + * Copies the ginve source to the given destination recursively. Overwrites + * existing files/directory on the destination path if told so. + * + * @param source + * the source file/directory to copy + * @param destination + * the destination to copy to + * @param overwrite + * overwrites existing files/directories if <code>true</code>. + * Does not overwrite otherwise. + * @throws IOException + */ + public static void copy(File source, File destination, boolean overwrite) throws IOException { + if (!exists(source) + || destination == null) { + return; + } + + if (source.isDirectory()) { + copyDirectory(source, destination, overwrite); + } else { + copyFile(source, destination, overwrite); + } + } + + private static void copyDirectory(File source, File destination, boolean overwrite) throws IOException { + Assert.isLegal(source != null); + Assert.isLegal(source.isDirectory()); + Assert.isLegal(destination != null); + + destination = getDestinationDirectory(source, destination); + + if (!destination.exists()) { + destination.mkdir(); + } + + for (File content : source.listFiles()) { + if (content.isDirectory()) { + copyDirectory(content, new File(destination, content.getName()), overwrite); + } else { + copyFile(content, new File(destination, content.getName()), overwrite); + } + } + } + + private static File getDestinationDirectory(File source, File destination) { + if (!source.getName().equals(destination.getName())) { + destination = new File(destination, source.getName()); + } + return destination; + } + + private static void copyFile(File source, File destination, boolean overwrite) throws IOException { + Assert.isLegal(source != null); + Assert.isLegal(source.isFile()); + Assert.isLegal(destination != null); + + destination = getDestinationFile(source, destination); + + if (exists(destination) + && !overwrite) { + return; + } + + if (isDirectory(destination)) { + if (!overwrite) { + return; + } + destination.delete(); + } + + writeTo(source, destination); + } + + private static File getDestinationFile(File source, File destination) { + if (!source.getName().equals(destination.getName())) { + destination = new File(destination, source.getName()); + } + return destination; + } + + private static final void writeTo(File source, File destination) throws IOException { + Assert.isLegal(source != null); + Assert.isLegal(destination != null); + + InputStream in = null; + writeTo(new BufferedInputStream(new FileInputStream(source)), destination); + } + + private static final void writeTo(InputStream in, File destination) throws IOException { + Assert.isLegal(in != null); + Assert.isLegal(destination != null); + + OutputStream out = null; + try { + out = new BufferedOutputStream(new FileOutputStream(destination)); + for (int read = -1; (read = in.read(buffer)) != -1; ) { + out.write(buffer, 0, read); + } + out.flush(); + } finally { + silentlyClose(in); + silentlyClose(out); + } + } + + private static void silentlyClose(InputStream in) { + try { + if (in != null) { + in.close(); + } + } catch (IOException e) { + // ignore + } + } + + private static void silentlyClose(OutputStream out) { + try { + if (out != null) { + out.close(); + } + } catch (IOException e) { + // ignore + } + } +} Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ImageRepository.java (from rev 37146, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/ImageRepository.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ImageRepository.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ImageRepository.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -0,0 +1,83 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat Inc.. + * 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: + * Red Hat Incorporated - initial API and implementation + *******************************************************************************/ +package org.jboss.tools.openshift.express.internal.ui.utils; + +import java.net.MalformedURLException; +import java.net.URL; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Plugin; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.resource.ImageRegistry; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.graphics.Image; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; + +public class ImageRepository { + + private ImageRegistry imageRegistry; + private URL baseUrl; + private Plugin plugin; + private String imageFolder; + + public ImageRepository(String imageFolder, Plugin plugin, ImageRegistry imageRegistry) { + this.imageFolder = imageFolder; + this.plugin = plugin; + this.imageRegistry = imageRegistry; + } + + protected URL getBaseUrl() { + try { + if (baseUrl == null) { + this.baseUrl = new URL(plugin.getBundle().getEntry("/"), imageFolder); + } + return baseUrl; + } catch (MalformedURLException e) { + OpenShiftUIActivator.log(e); + return null; + } + } + + public ImageDescriptor create(String name) { + return create(imageRegistry, name); + } + + private ImageDescriptor create(ImageRegistry registry,String name) { + return create(registry, name, getBaseUrl()); + } + + private ImageDescriptor create(ImageRegistry registry, String name, URL baseUrl) { + if (baseUrl == null) { + return null; + } + + ImageDescriptor imageDescriptor = + ImageDescriptor.createFromURL(createFileURL(name, baseUrl)); + registry.put(name, imageDescriptor); + return imageDescriptor; + } + + private URL createFileURL(String name, URL baseUrl) { + try { + return new URL(baseUrl, name); + } catch (MalformedURLException e) { + plugin.getLog().log( + new Status(IStatus.ERROR, plugin.getBundle().getSymbolicName(), NLS.bind( + "Could not create URL for image {0}", name), e)); + return null; + } + } + + public Image getImage(String name) { + return imageRegistry.get(name); + } +} Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/Logger.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/utils/Logger.java 2011-12-09 09:17:16 UTC (rev 37146) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/Logger.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -9,7 +9,7 @@ * Xavier Coulon - Initial API and implementation ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.utils; +package org.jboss.tools.openshift.express.internal.ui.utils; import java.text.DateFormat; import java.text.SimpleDateFormat; Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java (from rev 37146, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/common/StringUtils.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/StringUtils.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -0,0 +1,55 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.openshift.express.internal.ui.utils; + +import java.util.List; + +/** + * @author André Dietisheim + */ +public class StringUtils { + + private static final String LINE_SEPARATOR_KEY = "line.separator"; + + public static String null2emptyString(String value) { + if (value != null) { + return value; + } + return ""; + } + + public static boolean isEmpty(String value) { + return value == null + || value.length() == 0; + } + + public static <T> String toString(List<T> elements, ToStringConverter<T> converter) { + StringBuilder builder = new StringBuilder(); + for(int i = 0; i < elements.size(); i++) { + converter.toString(elements.get(i)); + builder.append(converter.toString(elements.get(i))); + if (i + 1 < elements.size()) { + builder.append(", "); + } + } + return builder.toString(); + } + + public static interface ToStringConverter<T> { + public String toString(T object); + } + + public static String getLineSeparator() { + return System.getProperty(LINE_SEPARATOR_KEY); + } + + +} Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/UIUtils.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/utils/UIUtils.java 2011-12-09 09:17:16 UTC (rev 37146) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/UIUtils.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -8,7 +8,7 @@ * Contributors: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.openshift.express.internal.utils; +package org.jboss.tools.openshift.express.internal.ui.utils; import org.eclipse.swt.events.FocusAdapter; import org.eclipse.swt.events.FocusEvent; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationDetailsDialog.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -33,7 +33,7 @@ import org.jboss.tools.openshift.express.client.utils.RFC822DateUtils; import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.common.StringUtils; +import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; /** * @author André Dietisheim Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardPage.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -60,8 +60,8 @@ import org.jboss.tools.openshift.express.client.NotFoundOpenShiftException; import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ImportProjectWizardModel; -import org.jboss.tools.openshift.express.internal.utils.Logger; /** * @author André Dietisheim Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreationLogDialog.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -32,7 +32,7 @@ import org.jboss.tools.common.ui.BrowserUtil; import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.common.StringUtils; +import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; /** * @author André Dietisheim Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPage.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -40,8 +40,8 @@ import org.jboss.tools.common.ui.databinding.DataBindingUtils; import org.jboss.tools.common.ui.databinding.ParametrizableWizardPageSupport; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; +import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.ImportProjectWizardModel; -import org.jboss.tools.openshift.express.internal.utils.UIUtils; /** * @author André Dietisheim Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizardPage.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -55,7 +55,7 @@ import org.jboss.tools.openshift.express.client.IEmbeddableCartridge; import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.common.StringUtils; +import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; import org.jboss.tools.openshift.express.internal.ui.wizard.CreationLogDialog.LogEntry; /** Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -49,8 +49,8 @@ import org.jboss.tools.common.ui.ssh.SshPrivateKeysPreferences; import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.common.FileUtils; -import org.jboss.tools.openshift.express.internal.ui.common.StringUtils; +import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils; +import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; /** * @author André Dietisheim Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -24,7 +24,7 @@ import org.jboss.tools.openshift.express.client.OpenShiftException; import org.jboss.tools.openshift.express.client.SSHKeyPair; import org.jboss.tools.openshift.express.client.SSHPublicKey; -import org.jboss.tools.openshift.express.internal.ui.common.FileUtils; +import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils; /** * @author André Dietisheim Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/PassphraseDialog.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/PassphraseDialog.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/PassphraseDialog.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -14,7 +14,7 @@ import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Shell; -import org.jboss.tools.openshift.express.internal.ui.common.StringUtils; +import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils; public class PassphraseDialog extends InputDialog { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AddToExistingProjectStrategy.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AddToExistingProjectStrategy.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AddToExistingProjectStrategy.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -31,7 +31,7 @@ import org.jboss.tools.openshift.express.client.IApplication; import org.jboss.tools.openshift.express.client.IUser; import org.jboss.tools.openshift.express.client.OpenShiftException; -import org.jboss.tools.openshift.express.internal.ui.common.FileUtils; +import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils; /** * @author André Dietisheim <adietish(a)redhat.com&gt; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProjectStrategy.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProjectStrategy.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportNewProjectStrategy.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -30,8 +30,8 @@ import org.jboss.tools.openshift.express.client.IApplication; import org.jboss.tools.openshift.express.client.IUser; import org.jboss.tools.openshift.express.client.OpenShiftException; -import org.jboss.tools.openshift.express.internal.ui.common.ImportFailedException; -import org.jboss.tools.openshift.express.internal.ui.common.WontOverwriteException; +import org.jboss.tools.openshift.express.internal.ui.ImportFailedException; +import org.jboss.tools.openshift.express.internal.ui.WontOverwriteException; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.project.GeneralProjectImportOperation; import org.jboss.tools.openshift.express.internal.ui.wizard.appimport.project.MavenProjectImportOperation; Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java 2011-12-09 16:54:13 UTC (rev 37180) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java 2011-12-09 16:54:52 UTC (rev 37181) @@ -32,9 +32,9 @@ import org.eclipse.ui.IWorkbench; import org.jboss.tools.common.ui.WizardUtils; import org.jboss.tools.openshift.express.client.OpenShiftException; +import org.jboss.tools.openshift.express.internal.ui.ImportFailedException; import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.common.ImportFailedException; -import org.jboss.tools.openshift.express.internal.ui.common.WontOverwriteException; +import org.jboss.tools.openshift.express.internal.ui.WontOverwriteException; import org.jboss.tools.openshift.express.internal.ui.wizard.AdapterWizardPage; import org.jboss.tools.openshift.express.internal.ui.wizard.ApplicationWizardPage; import org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardPage;