wrapper 

Commit MetaInfo

Revision175 (tree)
Time2012-02-21 16:59:46
Authormortenson

Log Message

Remove some duplicate text resources.

Change Summary

Diff

--- trunk/wrapper/src/java/org/tanukisoftware/wrapper/WrapperManager.java (revision 174)
+++ trunk/wrapper/src/java/org/tanukisoftware/wrapper/WrapperManager.java (revision 175)
@@ -2760,9 +2760,9 @@
27602760 }
27612761 sb.append( "]" );
27622762
2763- m_outDebug.println( getRes().getString(
2764- "WrapperManager.start({0}, {1}) called by thread: {2}" ,
2765- listener , sb.toString(), Thread.currentThread().getName() ) );
2763+ m_outDebug.println( getRes().getString( "{0} called by thread: {1}",
2764+ "WrapperManager.start(a " + listener.getClass().getName() + ", " + sb.toString() + ")",
2765+ Thread.currentThread().getName() ) );
27662766 }
27672767
27682768 synchronized( WrapperManager.class )
@@ -2861,9 +2861,9 @@
28612861
28622862 if ( m_debug )
28632863 {
2864- m_outDebug.println( getRes().getString(
2865- "WrapperManager.requestShutdownLock() called by thread: {0}. New thread lock count: {1}, total lock count: {2}",
2866- thisThread.getName(), new Integer( lock.m_count ), new Integer( m_shutdownLocks ) ) );
2864+ m_outDebug.println( getRes().getString( "{0} called by thread: {1} (New thread lock count: {2}, total lock count: {3})",
2865+ "WrapperManager.requestShutdownLock()",
2866+ thisThread.getName(), new Integer( lock.m_count ), new Integer( m_shutdownLocks ) ) );
28672867 }
28682868 }
28692869 }
@@ -2891,9 +2891,9 @@
28912891
28922892 if ( m_debug )
28932893 {
2894- m_outDebug.println( getRes().getString(
2895- "WrapperManager.releaseShutdownLock() called by thread: {0}. New thread lock count: {1}, total lock count: {2}" ,
2896- thisThread.getName(), new Integer( lock.m_count ), new Integer( m_shutdownLocks ) ) );
2894+ m_outDebug.println( getRes().getString( "{0} called by thread: {1} (New thread lock count: {2}, total lock count: {3})",
2895+ "WrapperManager.releaseShutdownLock()",
2896+ thisThread.getName(), new Integer( lock.m_count ), new Integer( m_shutdownLocks ) ) );
28972897 }
28982898
28992899 if ( lock.m_count <= 0 )
@@ -2963,8 +2963,9 @@
29632963
29642964 if ( m_debug )
29652965 {
2966- m_outDebug.println(getRes().getString(
2967- "WrapperManager.restart() called by thread: {0}" , Thread.currentThread().getName() ) );
2966+ m_outDebug.println( getRes().getString( "{0} called by thread: {1}",
2967+ "WrapperManager.restart()",
2968+ Thread.currentThread().getName() ) );
29682969 }
29692970
29702971 restartInner();
@@ -3003,8 +3004,9 @@
30033004 {
30043005 if ( m_debug )
30053006 {
3006- m_outDebug.println(getRes().getString(
3007- "WrapperManager.restartAndReturn() called by thread: {0} already stopping." ,Thread.currentThread().getName() ) );
3007+ m_outDebug.println( getRes().getString( "{0} called by thread: {1} (already stopping)",
3008+ "WrapperManager.restartAndReturn()",
3009+ Thread.currentThread().getName() ) );
30083010 }
30093011 return;
30103012 }
@@ -3012,8 +3014,9 @@
30123014 {
30133015 if ( m_debug )
30143016 {
3015- m_outDebug.println( getRes().getString(
3016- "WrapperManager.restartAndReturn() called by thread: {0}" ,Thread.currentThread().getName() ) );
3017+ m_outDebug.println( getRes().getString( "{0} called by thread: {1}",
3018+ "WrapperManager.restartAndReturn()",
3019+ Thread.currentThread().getName() ) );
30173020 }
30183021 }
30193022 }
@@ -3110,9 +3113,9 @@
31103113
31113114 if ( m_debug )
31123115 {
3113- m_outDebug.println( getRes().getString(
3114- "WrapperManager.stop({0}) called by thread: {1}",
3115- new Integer( exitCode ), Thread.currentThread().getName() ) );
3116+ m_outDebug.println( getRes().getString( "{0} called by thread: {1}",
3117+ "WrapperManager.stop(" + exitCode + ")",
3118+ Thread.currentThread().getName() ) );
31163119 }
31173120
31183121 stopCommon( exitCode, 1000 );
@@ -3164,9 +3167,9 @@
31643167 {
31653168 if ( m_debug )
31663169 {
3167- m_outDebug.println( getRes().getString(
3168- "WrapperManager.stopAndReturn({0}) called by thread: {1} already stopping.",
3169- new Integer( exitCode ), Thread.currentThread().getName() ) );
3170+ m_outDebug.println( getRes().getString( "{0} called by thread: {1} (already stopping)",
3171+ "WrapperManager.stopAndReturn(" + exitCode + ")",
3172+ Thread.currentThread().getName() ) );
31703173 }
31713174 return;
31723175 }
@@ -3174,9 +3177,9 @@
31743177 {
31753178 if ( m_debug )
31763179 {
3177- m_outDebug.println( getRes().getString(
3178- "WrapperManager.stopAndReturn({0}) called by thread: {1}" ,
3179- new Integer( exitCode ), Thread.currentThread().getName() ) );
3180+ m_outDebug.println( getRes().getString( "{0} called by thread: {1}",
3181+ "WrapperManager.stopAndReturn(" + exitCode + ")",
3182+ Thread.currentThread().getName() ) );
31803183 }
31813184 }
31823185 }
@@ -3228,9 +3231,9 @@
32283231
32293232 if ( m_debug )
32303233 {
3231- m_outDebug.println( getRes().getString(
3232- "WrapperManager.stopImmediate({0}) called by thread: {1}" ,
3233- new Integer( exitCode ), Thread.currentThread().getName() ) );
3234+ m_outDebug.println( getRes().getString( "{0} called by thread: {1}",
3235+ "WrapperManager.stopImmediate(" + exitCode + ")",
3236+ Thread.currentThread().getName() ) );
32343237 }
32353238
32363239 stopCommon( exitCode, 250 );
旧リポジトリブラウザで表示