summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xorg.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerLabelProvider.java2
-rw-r--r--org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java22
-rw-r--r--org.tizen.common.sdblib/src/org/tizen/sdblib/DeviceMonitor.java2
-rw-r--r--org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntry.java20
-rw-r--r--org.tizen.common.sdblib/src/org/tizen/sdblib/service/SyncService.java4
-rw-r--r--org.tizen.common.sign/.classpath1
-rw-r--r--org.tizen.common.sign/META-INF/MANIFEST.MF1
-rw-r--r--org.tizen.common.sign/build.properties1
-rw-r--r--org.tizen.common.sign/lib/CertificateGenerator.jarbin2636307 -> 0 bytes
-rwxr-xr-xorg.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningPreferencePage.java2
-rw-r--r--package/changelog10
-rw-r--r--package/pkginfo.manifest2
12 files changed, 57 insertions, 10 deletions
diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerLabelProvider.java b/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerLabelProvider.java
index 7ba60f2f6..e884a7dc9 100755
--- a/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerLabelProvider.java
+++ b/org.tizen.common.connection/src/org/tizen/common/connection/explorer/ConnectionExplorerLabelProvider.java
@@ -136,7 +136,7 @@ public class ConnectionExplorerLabelProvider extends LabelProvider
public static String getDeviceSerialWithName(FileEntry entry)
{
- return combineSerialWithName(entry.getDevice().getSerialNumber(), entry.getName());
+ return combineSerialWithName(entry.getDevice().getSerialNumber(), entry.getDevice().getDeviceName());
}
private static String combineSerialWithName(String serial, String name)
diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
index 8f7b8c8cf..7a3bdf984 100644
--- a/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
+++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
@@ -50,6 +50,7 @@ import org.tizen.sdblib.service.FileEntry;
import org.tizen.sdblib.service.FileEntryType;
import org.tizen.sdblib.service.SyncService;
import org.tizen.sdblib.util.FilenameUtil;
+import org.tizen.sdblib.util.ObjectUtil;
import org.tizen.sdblib.util.SdbShellProcess;
import org.tizen.sdblib.util.StreamGobbler;
@@ -469,6 +470,7 @@ implements IDevice
void update( final int changeMask, final String name )
{
this.deviceName = name;
+ getRoot().setName( name );
update(changeMask);
}
@@ -509,5 +511,25 @@ implements IDevice
return serialNumber;
}
+ @Override
+ public
+ boolean
+ equals(
+ final Object obj
+ )
+ {
+ if ( this == obj )
+ {
+ return true;
+ }
+
+ if ( !( obj instanceof IDevice ) )
+ {
+ return false;
+ }
+
+ final IDevice device = (IDevice) obj;
+ return ObjectUtil.equals( getSerialNumber(), device.getSerialNumber() );
+ }
}
diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/DeviceMonitor.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/DeviceMonitor.java
index 0384bc9b1..f522cf055 100644
--- a/org.tizen.common.sdblib/src/org/tizen/sdblib/DeviceMonitor.java
+++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/DeviceMonitor.java
@@ -283,7 +283,7 @@ extends AbstractServer
foundMatch = true;
// update the name if needed.
- if (device.getDeviceName() != newDevice.getDeviceName()){
+ if (!device.getDeviceName().equals(newDevice.getDeviceName())){
device.update(Device.CHANGE_NAME, newDevice.getDeviceName());
}
diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntry.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntry.java
index dc427e173..9816454d6 100644
--- a/org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntry.java
+++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/service/FileEntry.java
@@ -101,7 +101,7 @@ implements Comparable<FileEntry>
/**
* File name
*/
- protected final String name;
+ protected String name;
/**
* Type of file
@@ -259,6 +259,17 @@ implements Comparable<FileEntry>
}
/**
+ * Setting the name of the entry
+ *
+ */
+ public
+ void
+ setName(String name)
+ {
+ this.name = name;
+ }
+
+ /**
* Returns the size string of the entry, as returned by <code>ls</code>.
*
* @return size of the entry
@@ -552,12 +563,17 @@ implements Comparable<FileEntry>
final Object obj
)
{
+ if ( this == obj )
+ {
+ return true;
+ }
if ( !( obj instanceof FileEntry ) )
{
return false;
}
- FileEntry other = (FileEntry) obj;
+ final FileEntry other = (FileEntry) obj;
return (
+ ObjectUtil.equals( this.getDevice(), other.getDevice() ) &&
ObjectUtil.equals( this.name, other.name ) &&
ObjectUtil.equals( this.parent, other.parent )
);
diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/service/SyncService.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/service/SyncService.java
index 493401949..0b5d848fb 100644
--- a/org.tizen.common.sdblib/src/org/tizen/sdblib/service/SyncService.java
+++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/service/SyncService.java
@@ -606,10 +606,12 @@ implements Closeable
doPush(
final InputStream in,
final FileEntry remote,
- final ISyncProgressMonitor monitor,
+ ISyncProgressMonitor monitor,
final int timeOut
)
{
+ monitor = nvl( monitor, NullSyncProgressMonitor.getInstance() );
+
final long startTime = System.currentTimeMillis();
Log.d( "sync", "start at " + startTime + " ms" );
FileEntryOutputStream out = null;
diff --git a/org.tizen.common.sign/.classpath b/org.tizen.common.sign/.classpath
index 7589ba486..15593bb0f 100644
--- a/org.tizen.common.sign/.classpath
+++ b/org.tizen.common.sign/.classpath
@@ -4,7 +4,6 @@
<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/HashSign.jar"/>
<classpathentry exported="true" kind="lib" path="lib/xmlsec-1.5.3.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/CertificateGenerator.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
diff --git a/org.tizen.common.sign/META-INF/MANIFEST.MF b/org.tizen.common.sign/META-INF/MANIFEST.MF
index fc402fef2..f7b3311a5 100644
--- a/org.tizen.common.sign/META-INF/MANIFEST.MF
+++ b/org.tizen.common.sign/META-INF/MANIFEST.MF
@@ -22,7 +22,6 @@ Export-Package: hashsign,
org.tizen.common.sign.ui,
org.tizen.common.sign.util
Bundle-ClassPath: lib/KeyCertGeneratorApi.jar,
- lib/CertificateGenerator.jar,
lib/HashSign.jar,
lib/xmlsec-1.5.3.jar,
lib/commons-codec-1.4.jar,
diff --git a/org.tizen.common.sign/build.properties b/org.tizen.common.sign/build.properties
index 18f9a37b8..b28114bd0 100644
--- a/org.tizen.common.sign/build.properties
+++ b/org.tizen.common.sign/build.properties
@@ -5,7 +5,6 @@ bin.includes = plugin.xml,\
.,\
key/,\
OSGI-INF/,\
- lib/CertificateGenerator.jar,\
lib/HashSign.jar,\
lib/xmlsec-1.5.3.jar,\
about_files/,\
diff --git a/org.tizen.common.sign/lib/CertificateGenerator.jar b/org.tizen.common.sign/lib/CertificateGenerator.jar
deleted file mode 100644
index 0f94b296b..000000000
--- a/org.tizen.common.sign/lib/CertificateGenerator.jar
+++ /dev/null
Binary files differ
diff --git a/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningPreferencePage.java b/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningPreferencePage.java
index 1430b5010..ba0c43c45 100755
--- a/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningPreferencePage.java
+++ b/org.tizen.common.sign/src/org/tizen/common/sign/preferences/SigningPreferencePage.java
@@ -927,7 +927,7 @@ public class SigningPreferencePage extends PreferencePage implements IWorkbenchP
String absolutePath = certPath.toFile().getAbsolutePath();
String successMsg = "The certificate was generated to '" + absolutePath +"'.\n" +
"Do you want to fill the author certificate information automatically?";
- boolean bAutoFill = MessageDialog.openQuestion( activeShell, "Generation success", successMsg );
+ boolean bAutoFill = MessageDialog.openQuestion( activeShell, "Generate", successMsg );
if ( bAutoFill ) {
SigningProfile profile = getSelectedProfile( listViewer.getSelection() );
diff --git a/package/changelog b/package/changelog
index 40068ca4e..abe981c19 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,13 @@
+* 2.1.79
+- Fix device indentification bug
+- removed an old cert generator library
+== shingil.kang <shingil.kang@samsung.com> 2013-06-27
+* 2.1.78
+- Fixed a bug where conneciton explorer showes unknown name when attaching device
+== shingil.kang <shingil.kang@samsung.com> 2013-06-26
+* 2.1.77
+- execute rpm i command with --force option
+== gune.kim <gune.kim@samsung.com> 2013-06-26
* 2.1.76
- Added a distributor sequence and a note in the distributor part of security profile preferences
- Supports author certificate generation in IDE
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index adde0c1eb..005946d3a 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.1.76
+Version:2.1.79
Source:common-eplugin
Maintainer:kangho kim <kh5325.kim@samsung.com>, yoonki park <yoonki.park@samsung.com>, hyunsik non <hyunsik.noh@samsung.com>, taeyoung son <taeyoung2.son@samsung.com>, gune Kim <gune.kim@samsung.com>, ho namkoong <ho.namkoong@samsung.com>, hyeongseok heo <hyeong-seok.heo@samsung.com>, gyeongseok seo <gyeongseok.seo@samsung.com>, jihoon song <jihoon80.song@samsung.com>, changhyun lee <changhyun1.lee@samsung.com>, bonyong lee <bonyong.lee@samsung.com>, shingil kang <shingil.kang@samsung.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 23:40:30 +0000