This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: more merging work
- From: Michael Koch <konqueror at gmx dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Mon, 3 May 2004 22:07:00 +0200
- Subject: Patch: more merging work
Hi list,
I just commited the attached patch from Mark Wielaard from GNU classpath
to trunk.
Michael
2004-05-03 Mark Wielaard <mark@klomp.org>
* gnu/java/awt/peer/gtk/GtkTextAreaPeer.java (minimumSize): Removed
unused variables hScrollbarHeight and vScrollbarWidth.
(preferredSize): Likewise.
* gnu/java/security/provider/DSAParameters.java (engineToString):
Removed unused call to System.getProperty("line.seperator");
* java/security/Security.java (loadProviders): Return result.
Index: gnu/java/awt/peer/gtk/GtkTextAreaPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,v
retrieving revision 1.7
diff -u -r1.7 GtkTextAreaPeer.java
--- gnu/java/awt/peer/gtk/GtkTextAreaPeer.java 13 Jan 2004 20:58:33 -0000 1.7
+++ gnu/java/awt/peer/gtk/GtkTextAreaPeer.java 3 May 2004 20:05:16 -0000
@@ -105,8 +105,6 @@
public Dimension minimumSize (int rows, int cols)
{
TextArea ta = ((TextArea) awtComponent);
- int hScrollbarHeight = 0;
- int vScrollbarWidth = 0;
int height = 0;
int width = 0;
@@ -137,8 +135,6 @@
public Dimension preferredSize (int rows, int cols)
{
TextArea ta = ((TextArea) awtComponent);
- int hScrollbarHeight = 0;
- int vScrollbarWidth = 0;
int height = 0;
int width = 0;
Index: gnu/java/security/provider/DSAParameters.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/security/provider/DSAParameters.java,v
retrieving revision 1.4
diff -u -r1.4 DSAParameters.java
--- gnu/java/security/provider/DSAParameters.java 30 Apr 2003 07:23:40 -0000 1.4
+++ gnu/java/security/provider/DSAParameters.java 3 May 2004 20:05:16 -0000
@@ -154,7 +154,6 @@
public String engineToString()
{
- String lineSeparator = System.getProperty("line.seperator");
return ("q: " + q + " p: " + p + " g: " + g);
}
Index: java/security/Security.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/Security.java,v
retrieving revision 1.17
diff -u -r1.17 Security.java
--- java/security/Security.java 20 Apr 2004 14:44:55 -0000 1.17
+++ java/security/Security.java 3 May 2004 20:05:16 -0000
@@ -150,7 +150,7 @@
result = false;
}
- return false;
+ return result;
}
/**