Author: adietish
Date: 2011-01-12 06:44:44 -0500 (Wed, 12 Jan 2011)
New Revision: 28121
Removed:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/StringUtils.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AbstractInstanceHandler.java
Log:
merged string utils
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2011-01-12
11:03:00 UTC (rev 28120)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/META-INF/MANIFEST.MF 2011-01-12
11:44:44 UTC (rev 28121)
@@ -14,6 +14,7 @@
org.jboss.tools.deltacloud.core.client;x-friends:="org.jboss.tools.deltacloud.test,org.jboss.tools.deltacloud.ui",
org.jboss.tools.deltacloud.core.client.request;x-friends:="org.jboss.tools.deltacloud.test",
org.jboss.tools.deltacloud.core.client.unmarshal;x-friends:="org.jboss.tools.deltacloud.test",
+ org.jboss.tools.deltacloud.core.client.utils,
org.jboss.tools.deltacloud.core.job,
org.jboss.tools.internal.deltacloud.core.observable;x-friends:="org.jboss.tools.deltacloud.ui"
Bundle-ClassPath: .,
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java 2011-01-12
11:03:00 UTC (rev 28120)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/utils/StringUtils.java 2011-01-12
11:44:44 UTC (rev 28121)
@@ -10,11 +10,70 @@
******************************************************************************/
package org.jboss.tools.deltacloud.core.client.utils;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
/**
- * @author André Dietisheim
+ * @author Andre Dietisheim
*/
public class StringUtils {
+ /**
+ * Returns a formatted string for a collection of elements that get
+ * formatted by a user supplied element formatter.
+ *
+ * @param elements
+ * the elements to be processed
+ * @param elements
+ * the elements
+ * @param elementFormatter
+ * the formatter to apply on each element to be processed
+ * @return the formatted string
+ */
+ public static <E> String getFormattedString(Collection<E> elements,
IElementFormatter<E> elementFormatter) {
+ StringBuilder builder = new StringBuilder();
+ for (E element : elements) {
+ String formattedElement = elementFormatter.format(element);
+ if (formattedElement != null && formattedElement.length() > 0) {
+ builder.append(formattedElement);
+ }
+ }
+ if (builder.length() > 0) {
+ return builder.toString();
+ } else {
+ return "";
+ }
+ }
+
+ public interface IElementFormatter<E> {
+ public String format(E element);
+ }
+
+ /**
+ * Returns a collection of formatted strings for the given collection of
+ * elements and given formatter
+ *
+ * @param <E>
+ * the type of elements that shall be processed
+ * @param elements
+ * the elements to be processed
+ * @param elementFormatter
+ * the formatter to apply on each element to be processed
+ * @return the formatted strings
+ */
+ public static <E> Collection<String> getFormattedStrings(Collection<E>
elements,
+ IElementFormatter<E> elementFormatter) {
+ List<String> strings = new ArrayList<String>();
+ for (E element : elements) {
+ String formattedElement = elementFormatter.format(element);
+ if (formattedElement != null && formattedElement.length() > 0) {
+ strings.add(formattedElement);
+ }
+ }
+ return strings;
+ }
+
public static String null2EmptyString(String stringValue) {
if (stringValue == null) {
return "";
@@ -30,4 +89,5 @@
return stringValue;
}
+
}
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AbstractInstanceHandler.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AbstractInstanceHandler.java 2011-01-12
11:03:00 UTC (rev 28120)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/deltacloud/ui/commands/AbstractInstanceHandler.java 2011-01-12
11:44:44 UTC (rev 28121)
@@ -15,9 +15,9 @@
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.jboss.tools.deltacloud.core.DeltaCloudInstance;
+import org.jboss.tools.deltacloud.core.client.utils.StringUtils;
+import org.jboss.tools.deltacloud.core.client.utils.StringUtils.IElementFormatter;
import org.jboss.tools.deltacloud.core.job.InstanceActionJob;
-import org.jboss.tools.internal.deltacloud.ui.utils.StringUtils;
-import org.jboss.tools.internal.deltacloud.ui.utils.StringUtils.IElementFormatter;
import org.jboss.tools.internal.deltacloud.ui.utils.UIUtils;
/**
Deleted:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/StringUtils.java
===================================================================
---
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/StringUtils.java 2011-01-12
11:03:00 UTC (rev 28120)
+++
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/utils/StringUtils.java 2011-01-12
11:44:44 UTC (rev 28121)
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2010 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.internal.deltacloud.ui.utils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * @author Andre Dietisheim
- */
-public class StringUtils {
-
- /**
- * Returns a formatted string for a collection of elements that get
- * formatted by a user supplied element formatter.
- *
- * @param elements
- * the elements to be processed
- * @param elements
- * the elements
- * @param elementFormatter
- * the formatter to apply on each element to be processed
- * @return the formatted string
- */
- public static <E> String getFormattedString(Collection<E> elements,
IElementFormatter<E> elementFormatter) {
- StringBuilder builder = new StringBuilder();
- for (E element : elements) {
- String formattedElement = elementFormatter.format(element);
- if (formattedElement != null && formattedElement.length() > 0) {
- builder.append(formattedElement);
- }
- }
- if (builder.length() > 0) {
- return builder.toString();
- } else {
- return "";
- }
- }
-
- public interface IElementFormatter<E> {
- public String format(E element);
- }
-
- /**
- * Returns a collection of formatted strings for the given collection of
- * elements and given formatter
- *
- * @param <E>
- * the type of elements that shall be processed
- * @param elements
- * the elements to be processed
- * @param elementFormatter
- * the formatter to apply on each element to be processed
- * @return the formatted strings
- */
- public static <E> Collection<String> getFormattedStrings(Collection<E>
elements,
- IElementFormatter<E> elementFormatter) {
- List<String> strings = new ArrayList<String>();
- for (E element : elements) {
- String formattedElement = elementFormatter.format(element);
- if (formattedElement != null && formattedElement.length() > 0) {
- strings.add(formattedElement);
- }
- }
- return strings;
- }
-}