summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Gayed <ggayed>2011-01-10 16:09:29 +0000
committerGrant Gayed <ggayed>2011-01-10 16:09:29 +0000
commit957daab4fff642ef4988915d2b86fa448d804063 (patch)
tree97d11778c6464449b09b2bc62d566823272ce44d
parentb2a2946474c8e79cc927b1b698d3eeb96c83a55a (diff)
downloadeclipse.platform.swt-957daab4fff642ef4988915d2b86fa448d804063.tar.gz
eclipse.platform.swt-957daab4fff642ef4988915d2b86fa448d804063.tar.xz
eclipse.platform.swt-957daab4fff642ef4988915d2b86fa448d804063.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java24
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/SWTMessages.properties2
3 files changed, 14 insertions, 14 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
index 938ab0935c..94c83ec05d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/win32/library/make_win32.mak
@@ -22,7 +22,7 @@ SWT_PREFIX = swt
WS_PREFIX = win32
SWT_VERSION = $(maj_ver)$(min_ver)
SWT_LIB = $(SWT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).dll
-SWT_LIBS = comctl32.lib shell32.lib imm32.lib oleacc.lib usp10.lib wininet.lib
+SWT_LIBS = comctl32.lib shell32.lib imm32.lib oleacc.lib usp10.lib wininet.lib Crypt32.lib
SWT_OBJS = swt.obj callback.obj c.obj c_stats.obj \
os.obj os_structs.obj os_custom.obj os_stats.obj \
com_structs.obj com.obj com_stats.obj com_custom.obj
diff --git a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java
index 64ab97522d..f4ee55d440 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT WebKit/win32/org/eclipse/swt/browser/WebFrameLoadDelegate.java
@@ -628,33 +628,33 @@ void showCertificate (Shell parent, int /*long*/ certificate) {
OS.MoveMemory (info, context.pCertInfo, CERT_INFO.sizeof);
int length = OS.CertNameToStr (OS.X509_ASN_ENCODING, info.Issuer, OS.CERT_SIMPLE_NAME_STR, null, 0);
- TCHAR tchar = new TCHAR(0, length);
+ TCHAR tchar = new TCHAR (0, length);
OS.CertNameToStr (OS.X509_ASN_ENCODING, info.Issuer, OS.CERT_SIMPLE_NAME_STR, tchar, length);
- String issuer = tchar.toString(0, tchar.strlen());
+ String issuer = tchar.toString (0, tchar.strlen ());
length = OS.CertNameToStr (OS.X509_ASN_ENCODING, info.Subject, OS.CERT_SIMPLE_NAME_STR, null, 0);
- tchar = new TCHAR(0, length);
+ tchar = new TCHAR (0, length);
OS.CertNameToStr (OS.X509_ASN_ENCODING, info.Subject, OS.CERT_SIMPLE_NAME_STR, tchar, length);
- String subject = tchar.toString(0, tchar.strlen());
+ String subject = tchar.toString (0, tchar.strlen ());
- String dateSeparator = "/"; //$NON-NLS-1$
- String timeSeparator = ":"; //$NON-NLS-1$
+ final String SEPARATOR_DATE = "/"; //$NON-NLS-1$
+ final String SEPARATOR_TIME = ":"; //$NON-NLS-1$
SYSTEMTIME systemTime = new SYSTEMTIME ();
OS.FileTimeToSystemTime (info.NotBefore, systemTime);
- String validFrom = systemTime.wDay + dateSeparator + systemTime.wMonth + dateSeparator + systemTime.wYear;
- String validFromTime = systemTime.wHour + timeSeparator + systemTime.wMinute + timeSeparator + systemTime.wSecond;
+ String validFrom = systemTime.wDay + SEPARATOR_DATE + systemTime.wMonth + SEPARATOR_DATE + systemTime.wYear;
+ String validFromTime = systemTime.wHour + SEPARATOR_TIME + systemTime.wMinute + SEPARATOR_TIME + systemTime.wSecond;
systemTime = new SYSTEMTIME ();
OS.FileTimeToSystemTime (info.NotAfter, systemTime);
- String validTo = systemTime.wDay + dateSeparator + systemTime.wMonth + dateSeparator + systemTime.wYear;
- String validToTime = systemTime.wHour + timeSeparator + systemTime.wMinute + timeSeparator + systemTime.wSecond;
+ String validTo = systemTime.wDay + SEPARATOR_DATE + systemTime.wMonth + SEPARATOR_DATE + systemTime.wYear;
+ String validToTime = systemTime.wHour + SEPARATOR_TIME + systemTime.wMinute + SEPARATOR_TIME + systemTime.wSecond;
length = info.SerialNumber.cbData;
byte[] serialNumber = new byte[length];
OS.MoveMemory (serialNumber, info.SerialNumber.pbData, length);
- String hexSerialNumber = new String();
+ String hexSerialNumber = new String ();
for (int i = length - 1; i >= 0; i--) {
- int number = (0xFF & serialNumber[i]);
+ int number = 0xFF & serialNumber[i];
String hex = Integer.toHexString (number);
if (hex.length () == 1) hexSerialNumber += "0"; //$NON-NLS-1$
hexSerialNumber += hex + " "; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/SWTMessages.properties b/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/SWTMessages.properties
index 61833492d5..8c12378243 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/SWTMessages.properties
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/SWTMessages.properties
@@ -110,6 +110,6 @@ SWT_Value=Value
SWT_Version=Version
SWT_ValidFrom=Valid From
SWT_ValidTo=Valid To
-SWT_ValidFromTo=Valid from {0} to {1}
+SWT_ValidFromTo=Valid from: {0} to: {1}
SWT_Subject=Subject
SWT_SerialNumber=Serial Number \ No newline at end of file