Status.java, [...]: Removing redundant modifiers.

2003-10-11  Michael Koch  <konqueror@gmx.de>

	* javax/transaction/Status.java,
	javax/transaction/Synchronization.java,
	javax/transaction/Transaction.java,
	javax/transaction/TransactionManager.java,
	javax/transaction/UserTransaction.java,
	javax/transaction/xa/XAResource.java,
	javax/transaction/xa/Xid.java:
	Removing redundant modifiers.

From-SVN: r72365

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 2bd3eff287348177ff95be3928761f898e47ec61..cd571a3a74edb82c64896f4a4f1df45e95aea02a 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,14 @@
+2003-10-11  Michael Koch  <konqueror@gmx.de>
+
+       * javax/transaction/Status.java,
+       javax/transaction/Synchronization.java,
+       javax/transaction/Transaction.java,
+       javax/transaction/TransactionManager.java,
+       javax/transaction/UserTransaction.java,
+       javax/transaction/xa/XAResource.java,
+       javax/transaction/xa/Xid.java:
+       Removing redundant modifiers.
+
 2003-10-11  Michael Koch  <konqueror@gmx.de>
 
        * javax/print/attribute/Attribute.java,

diff --git a/libjava/javax/transaction/Status.java b/libjava/javax/transaction/Status.java
index 7068602b197603fa4e45d9160830320761bf4090..7b3c4aea94650fc8e4a1a726a1d550937287d3e2 100644 (file)
--- a/libjava/javax/transaction/Status.java
+++ b/libjava/javax/transaction/Status.java
@@ -45,14 +45,14 @@ package javax.transaction;
 
 public interface Status
 {
-  public static final int STATUS_ACTIVE = 0;
-  public static final int STATUS_MARKED_ROLLBACK = 1;
-  public static final int STATUS_PREPARED = 2;
-  public static final int STATUS_COMMITTED = 3;
-  public static final int STATUS_ROLLEDBACK = 4;
-  public static final int STATUS_UNKNOWN = 5;
-  public static final int STATUS_NO_TRANSACTION = 6;
-  public static final int STATUS_PREPARING = 7;
-  public static final int STATUS_COMMITTING = 8;
-  public static final int STATUS_ROLLING_BACK = 9;
+  int STATUS_ACTIVE = 0;
+  int STATUS_MARKED_ROLLBACK = 1;
+  int STATUS_PREPARED = 2;
+  int STATUS_COMMITTED = 3;
+  int STATUS_ROLLEDBACK = 4;
+  int STATUS_UNKNOWN = 5;
+  int STATUS_NO_TRANSACTION = 6;
+  int STATUS_PREPARING = 7;
+  int STATUS_COMMITTING = 8;
+  int STATUS_ROLLING_BACK = 9;
 }

diff --git a/libjava/javax/transaction/Synchronization.java b/libjava/javax/transaction/Synchronization.java
index 7a1dfa5ce267b3b36433f910ac4a774c8e2fb5eb..e8d8eb917f85c3d18105a02beacf06d7d7c4ea4c 100644 (file)
--- a/libjava/javax/transaction/Synchronization.java
+++ b/libjava/javax/transaction/Synchronization.java
@@ -45,6 +45,6 @@ package javax.transaction;
 
 public interface Synchronization
 {
-  public void beforeCompletion();
-  public void afterCompletion(int status);
+  void beforeCompletion();
+  void afterCompletion(int status);
 }

diff --git a/libjava/javax/transaction/Transaction.java b/libjava/javax/transaction/Transaction.java
index 11aca01211e9f24c75c77ae33966479772c8ec5a..55303b7c7821908b35477cdf61927638d5d254cc 100644 (file)
--- a/libjava/javax/transaction/Transaction.java
+++ b/libjava/javax/transaction/Transaction.java
@@ -47,24 +47,24 @@ import javax.transaction.xa.XAResource;
 
 public interface Transaction
 {
-  public void commit()
+  void commit()
     throws RollbackException, HeuristicMixedException,
       HeuristicRollbackException, SecurityException, SystemException;
 
-  public boolean delistResource(XAResource xaRes, int flag)
+  boolean delistResource(XAResource xaRes, int flag)
     throws IllegalStateException, SystemException;
 
-  public boolean enlistResource(XAResource xaRes)
+  boolean enlistResource(XAResource xaRes)
     throws RollbackException, IllegalStateException, SystemException;
 
-  public int getStatus() throws SystemException;
+  int getStatus() throws SystemException;
 
-  public void registerSynchronization(Synchronization sync)
+  void registerSynchronization(Synchronization sync)
     throws RollbackException, IllegalStateException, SystemException;
 
-  public void rollback()
+  void rollback()
     throws IllegalStateException, SystemException;
 
-  public void setRollbackOnly()
+  void setRollbackOnly()
     throws IllegalStateException, SystemException;
 }

diff --git a/libjava/javax/transaction/TransactionManager.java b/libjava/javax/transaction/TransactionManager.java
index e0501afb1c5fdfde57993ecf9ad30ac520c3d38d..0a79bd3f6de359d761f3f79e6fd81d52ed269edc 100644 (file)
--- a/libjava/javax/transaction/TransactionManager.java
+++ b/libjava/javax/transaction/TransactionManager.java
@@ -45,28 +45,28 @@ package javax.transaction;
 
 public interface TransactionManager
 {
-  public void begin() throws NotSupportedException, SystemException;
+  void begin() throws NotSupportedException, SystemException;
 
-  public void commit()
+  void commit()
     throws RollbackException, HeuristicMixedException,
       HeuristicRollbackException, SecurityException,
       IllegalStateException, SystemException;
 
-  public int getStatus() throws SystemException;
+  int getStatus() throws SystemException;
 
-  public Transaction getTransaction() throws SystemException;
+  Transaction getTransaction() throws SystemException;
 
-  public void resume(Transaction tobj)
+  void resume(Transaction tobj)
     throws InvalidTransactionException, IllegalStateException,
       SystemException;
 
-  public void rollback()
+  void rollback()
     throws IllegalStateException, SecurityException, SystemException;
 
-  public void setRollbackOnly()
+  void setRollbackOnly()
     throws IllegalStateException, SystemException;
 
-  public void setTransactionTimeout(int seconds) throws SystemException;
+  void setTransactionTimeout(int seconds) throws SystemException;
 
-  public Transaction suspend() throws SystemException;
+  Transaction suspend() throws SystemException;
 }

diff --git a/libjava/javax/transaction/UserTransaction.java b/libjava/javax/transaction/UserTransaction.java
index fe8aad78a62b87844dc26f7f81f027c66dd107b9..1327a0c50eaa051589e8b301790b36f2b0447d71 100644 (file)
--- a/libjava/javax/transaction/UserTransaction.java
+++ b/libjava/javax/transaction/UserTransaction.java
@@ -45,20 +45,20 @@ package javax.transaction;
 
 public interface UserTransaction
 {
-  public void begin() throws NotSupportedException, SystemException;
+  void begin() throws NotSupportedException, SystemException;
 
-  public void commit()
+  void commit()
     throws RollbackException, HeuristicMixedException,
       HeuristicRollbackException, SecurityException,
       IllegalStateException, SystemException;
 
-  public void rollback()
+  void rollback()
     throws IllegalStateException, SecurityException, SystemException;
 
-  public void setRollbackOnly()
+  void setRollbackOnly()
     throws IllegalStateException, SystemException;
 
-  public int getStatus() throws SystemException;
+  int getStatus() throws SystemException;
 
-  public void setTransactionTimeout(int seconds) throws SystemException;
+  void setTransactionTimeout(int seconds) throws SystemException;
 }

diff --git a/libjava/javax/transaction/xa/XAResource.java b/libjava/javax/transaction/xa/XAResource.java
index 038923fded57910e1bf1bd094f64f13646241651..6fd0717e2d0a0a9253eaed775c6beb88b976c64d 100644 (file)
--- a/libjava/javax/transaction/xa/XAResource.java
+++ b/libjava/javax/transaction/xa/XAResource.java
@@ -44,26 +44,26 @@ package javax.transaction.xa;
 
 public interface XAResource
 {
-  public static final int TMENDRSCAN = 8388608;
-  public static final int TMFAIL = 536870912;
-  public static final int TMJOIN = 2097152;
-  public static final int TMNOFLAGS = 0;
-  public static final int TMONEPHASE = 1073741824;
-  public static final int TMRESUME = 134217728;
-  public static final int TMSTARTRSCAN = 16777216;
-  public static final int TMSUCCESS = 67108864;
-  public static final int TMSUSPEND = 33554432;
-  public static final int XA_RDONLY = 3;
-  public static final int XA_OK = 0;
+  int TMENDRSCAN = 8388608;
+  int TMFAIL = 536870912;
+  int TMJOIN = 2097152;
+  int TMNOFLAGS = 0;
+  int TMONEPHASE = 1073741824;
+  int TMRESUME = 134217728;
+  int TMSTARTRSCAN = 16777216;
+  int TMSUCCESS = 67108864;
+  int TMSUSPEND = 33554432;
+  int XA_RDONLY = 3;
+  int XA_OK = 0;
 
-  public void commit(Xid xid, boolean onePhase) throws XAException;
-  public void end(Xid xid, int flags) throws XAException;
-  public void forget(Xid xid) throws XAException;
-  public int getTransactionTimeout() throws XAException;
-  public boolean isSameRM(XAResource xares) throws XAException;
-  public int prepare(Xid xid) throws XAException;
-  public Xid[] recover(int flag) throws XAException;
-  public void rollback(Xid xid) throws XAException;
-  public boolean setTransactionTimeout(int seconds) throws XAException;
-  public void start(Xid xid, int flags) throws XAException;
+  void commit(Xid xid, boolean onePhase) throws XAException;
+  void end(Xid xid, int flags) throws XAException;
+  void forget(Xid xid) throws XAException;
+  int getTransactionTimeout() throws XAException;
+  boolean isSameRM(XAResource xares) throws XAException;
+  int prepare(Xid xid) throws XAException;
+  Xid[] recover(int flag) throws XAException;
+  void rollback(Xid xid) throws XAException;
+  boolean setTransactionTimeout(int seconds) throws XAException;
+  void start(Xid xid, int flags) throws XAException;
 }

diff --git a/libjava/javax/transaction/xa/Xid.java b/libjava/javax/transaction/xa/Xid.java
index d509ccfaf47c48d2a9058c0be6bc57232592cca2..c91843d303b9a46e2633207816987adf8fef88ff 100644 (file)
--- a/libjava/javax/transaction/xa/Xid.java
+++ b/libjava/javax/transaction/xa/Xid.java
@@ -44,10 +44,10 @@ package javax.transaction.xa;
 
 public interface Xid
 {
-  public static final int MAXGTRIDSIZE = 64;
-  public static final int MAXBQUALSIZE = 64;
+  int MAXGTRIDSIZE = 64;
+  int MAXBQUALSIZE = 64;
 
-  public int getFormatId();
-  public byte[] getGlobalTransactionId();
-  public byte[] getBranchQualifier();
+  int getFormatId();
+  byte[] getGlobalTransactionId();
+  byte[] getBranchQualifier();
 }