[Title] Remove duplicated jar

[Type]      Bugfix
[Module]    Sub
[Priority]  Minor
[CQ#]       // CQ Issue Number
[Redmine#]  // Redmine Isuue Number
[Problem]   // Problem Description
[Cause]     // Cause Description
[Solution]  // Solution Description
[TestCase]  // Executed the test-target (How to)

diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerPanel.java b/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerPanel.java
index 2478c1d..f629d87 100755 (executable)
--- a/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerPanel.java
+++ b/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerPanel.java
@@ -25,6 +25,8 @@
  */
 package org.tizen.common.connection.explorer;
 
+import static org.tizen.common.util.ArrayUtil.isEmpty;
+
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
@@ -628,7 +630,9 @@ public class ConnectionExplorerPanel extends Panel implements IDeviceChangeListe
                         FileEntry entry = (FileEntry) obj;
                         int ret = FileDialogUtils.confirmDelete(entry.getName());
                         if (ret == IDialogConstants.CANCEL_ID)
+                        {
                             continue;
+                        }
 
                         String command = null;
                         // create the delete command
@@ -844,8 +848,10 @@ public class ConnectionExplorerPanel extends Panel implements IDeviceChangeListe
     private void pushFiles(final String[] localFiles, final FileEntry remoteDirectory)
     {
         final String[] files = getFilesToOverwrite(localFiles, remoteDirectory);
-        if (files == null || files.length == 0)
+        if ( isEmpty( files ) )
+        {
             return;
+        }
         try
         {
             final SyncService sync = currentDevice.getSyncService();

diff --git a/org.tizen.common/.classpath b/org.tizen.common/.classpath
old mode 100644 (file)
new mode 100755 (executable)
index c7acd18..8e01f7b
--- a/org.tizen.common/.classpath
+++ b/org.tizen.common/.classpath
@@ -1,21 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-       <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.6.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.1.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/freemarker.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/sdblib.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.6.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.6.4.jar"/>
-       <classpathentry exported="true" kind="lib" path="test/lib/junit-4.10.jar" sourcepath="test/lib/junit-4.10-src.jar"/>
-       <classpathentry exported="true" kind="lib" path="test/lib/mockito-all-1.9.0.jar"/>
-       <classpathentry kind="lib" path="test/lib/asm-4.0.jar"/>
-       <classpathentry kind="lib" path="test/lib/asm-tree-4.0.jar"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="src" path="test/src"/>
-       <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.6.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.1.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/commons-io-2.4.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/freemarker.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/log4j-1.2.17.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/sdblib.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.6.4.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="lib/slf4j-log4j12-1.6.4.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="test/lib/junit-4.10.jar" sourcepath="test/lib/junit-4.10-src.jar"/>\r
+       <classpathentry exported="true" kind="lib" path="test/lib/mockito-all-1.9.0.jar"/>\r
+       <classpathentry kind="lib" path="test/lib/asm-4.0.jar"/>\r
+       <classpathentry kind="lib" path="test/lib/asm-tree-4.0.jar"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="src" path="src"/>\r
+       <classpathentry kind="src" path="test/src"/>\r
+       <classpathentry kind="output" path="bin"/>\r
+</classpath>\r

diff --git a/org.tizen.common/META-INF/MANIFEST.MF b/org.tizen.common/META-INF/MANIFEST.MF
old mode 100644 (file)
new mode 100755 (executable)
index 58127bd..39657a9
--- a/org.tizen.common/META-INF/MANIFEST.MF
+++ b/org.tizen.common/META-INF/MANIFEST.MF
@@ -24,6 +24,7 @@ Export-Package:
  org.apache.commons.lang3.text.translate,
  org.apache.commons.lang3.time,
  org.apache.commons.lang3.tuple,
+ org.apache.commons.logging,
  org.junit,
  org.junit.experimental,
  org.junit.experimental.categories,
@@ -143,4 +144,5 @@ Bundle-ClassPath: .,
  lib/commons-io-2.4.jar,
  lib/commons-lang3-3.1.jar,
  lib/commons-collections-3.2.1.jar,
- lib/commons-pool-1.6.jar
+ lib/commons-pool-1.6.jar,
+ lib/commons-logging-1.1.1.jar

diff --git a/org.tizen.common/build.properties b/org.tizen.common/build.properties
old mode 100644 (file)
new mode 100755 (executable)
index 3f006ba..49d1a30
--- a/org.tizen.common/build.properties
+++ b/org.tizen.common/build.properties
@@ -12,6 +12,7 @@ bin.includes = META-INF/,\
                lib/commons-collections-3.2.1.jar,\\r
                lib/commons-pool-1.6.jar,\\r
                OSGI-INF/,\\r
-               OSGI-INF/l10n/bundle.properties\r
+               OSGI-INF/l10n/bundle.properties,\\r
+               lib/commons-logging-1.1.1.jar\r
 javacSource = 1.6
 javacTarget = 1.6

diff --git a/org.tizen.common/lib/commons-logging-1.1.1.jar b/org.tizen.common/lib/commons-logging-1.1.1.jar
new file mode 100644 (file)
index 0000000..1deef14
Binary files /dev/null and b/org.tizen.common/lib/commons-logging-1.1.1.jar differ