Mercurial > hg > icedtea9

changeset 2318:3dc60ae70ef6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename getType to getAccessType to avoid conflict with Window.getType() from OpenJDK7 2010-07-23 Andrew John Hughes <ahughes@redhat.com> * netx/net/sourceforge/jnlp/security/AccessWarningPane.java: (addComponents()): Fix call to getType(). * netx/net/sourceforge/jnlp/security/CertWarningPane.java: Likewise. * netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java: (getType): Rename to getAccessType() to avoid conflict with Window.getType() in OpenJDK7.
author Andrew John Hughes <ahughes@redhat.com>
date Fri, 23 Jul 2010 10:56:39 +0100
parents 0e2081083c90
children b79b82edac07
files ChangeLog netx/net/sourceforge/jnlp/security/AccessWarningPane.java netx/net/sourceforge/jnlp/security/CertWarningPane.java netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java
diffstat 4 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jul 23 10:53:49 2010 +0100
+++ b/ChangeLog	Fri Jul 23 10:56:39 2010 +0100
@@ -1,3 +1,12 @@
+2010-07-23  Andrew John Hughes  <ahughes@redhat.com>
+
+	* netx/net/sourceforge/jnlp/security/AccessWarningPane.java:
+	(addComponents()): Fix call to getType().
+	* netx/net/sourceforge/jnlp/security/CertWarningPane.java: Likewise.
+	* netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java:
+	(getType): Rename to getAccessType() to avoid conflict with
+	Window.getType() in OpenJDK7.
+
 2010-07-23  Andrew John Hughes  <ahughes@redhat.com>
 
 	* netx/javax/jnlp/BasicService.java,
--- a/netx/net/sourceforge/jnlp/security/AccessWarningPane.java	Fri Jul 23 10:53:49 2010 +0100
+++ b/netx/net/sourceforge/jnlp/security/AccessWarningPane.java	Fri Jul 23 10:56:39 2010 +0100
@@ -85,7 +85,7 @@
          * Creates the actual GUI components, and adds it to this panel
          */
         private void addComponents() {
-                SecurityWarningDialog.AccessType type = parent.getType();
+                SecurityWarningDialog.AccessType type = parent.getAccessType();
                 JNLPFile file = parent.getFile();
 
                 String name = "";
--- a/netx/net/sourceforge/jnlp/security/CertWarningPane.java	Fri Jul 23 10:53:49 2010 +0100
+++ b/netx/net/sourceforge/jnlp/security/CertWarningPane.java	Fri Jul 23 10:56:39 2010 +0100
@@ -85,7 +85,7 @@
          * Creates the actual GUI components, and adds it to this panel
          */
         private void addComponents() {
-                SecurityWarningDialog.AccessType type = parent.getType();
+                SecurityWarningDialog.AccessType type = parent.getAccessType();
                 JNLPFile file = parent.getFile();
                 Certificate c = parent.getJarSigner().getPublisher();
 
--- a/netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java	Fri Jul 23 10:53:49 2010 +0100
+++ b/netx/net/sourceforge/jnlp/security/SecurityWarningDialog.java	Fri Jul 23 10:56:39 2010 +0100
@@ -364,7 +364,7 @@
 
         }
 
-        public AccessType getType() {
+        public AccessType getAccessType() {
                 return accessType;
         }