You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2004/06/03 14:38:54 UTC
cvs commit: cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/generator GeneratorSelector.java
vgritsenko 2004/06/03 05:38:54
Modified: src/blocks/axis/java/org/apache/cocoon/webservices/instrument
InstrumentationServiceImpl.java
src/blocks/xsp/java/org/apache/cocoon/components/language/generator
GeneratorSelector.java
Log:
cosmetic changes
Revision Changes Path
1.3 +13 -19 cocoon-2.1/src/blocks/axis/java/org/apache/cocoon/webservices/instrument/InstrumentationServiceImpl.java
Index: InstrumentationServiceImpl.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/axis/java/org/apache/cocoon/webservices/instrument/InstrumentationServiceImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InstrumentationServiceImpl.java 5 Mar 2004 13:01:43 -0000 1.2
+++ InstrumentationServiceImpl.java 3 Jun 2004 12:38:54 -0000 1.3
@@ -1,12 +1,12 @@
/*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -49,11 +49,10 @@
public void setInstrumentManager(final InstrumentManager iManager) {
if (iManager == null) {
- if (getLogger().isWarnEnabled())
- getLogger().warn(
- "No instrument manager available," +
- "please enable instrumentation in your web.xml"
- );
+ if (getLogger().isWarnEnabled()) {
+ getLogger().warn("No instrument manager available, " +
+ "please enable instrumentation in your web.xml");
+ }
}
// we require a DefaultInstrumentManager, attempt a cast.
@@ -100,10 +99,8 @@
// ensure we have an instrument manager available
if (!haveInstrumentManager()) {
- getLogger().warn(
- "No instrument manager available," +
- "please enable instrumentation in your web.xml"
- );
+ getLogger().warn("No instrument manager available, " +
+ "please enable instrumentation in your web.xml");
return EMPTY_INT_ARRAY;
}
@@ -122,10 +119,8 @@
// ensure we have an instrument manager available
if (!haveInstrumentManager()) {
- getLogger().warn(
- "No instrument manager available," +
- "please enable instrumentation in your web.xml"
- );
+ getLogger().warn("No instrument manager available, " +
+ "please enable instrumentation in your web.xml");
return EMPTY_STRING_ARRAY;
}
@@ -135,8 +130,7 @@
final List names = new ArrayList();
for (int i = 0; i < descriptors.length; ++i) {
-
- // list all instruments
+ // list all instruments
InstrumentDescriptor[] insts =
descriptors[i].getInstrumentDescriptors();
1.2 +8 -8 cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java
Index: GeneratorSelector.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/xsp/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GeneratorSelector.java 10 Mar 2004 12:58:04 -0000 1.1
+++ GeneratorSelector.java 3 Jun 2004 12:38:54 -0000 1.2
@@ -1,12 +1,12 @@
/*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -81,7 +81,7 @@
*/
public void setLogKitManager( final LogKitManager logkit ) {
super.setLogKitManager(logkit);
- if( null == this.logKitManager ) {
+ if (null == this.logKitManager) {
this.logKitManager = new LogkitLoggerManager( null, logkit );
}
}
@@ -91,7 +91,7 @@
*/
public void setLoggerManager( final LoggerManager logkit ) {
super.setLoggerManager(logkit);
- if( null == this.logKitManager ) {
+ if (null == this.logKitManager) {
this.logKitManager = new LogkitLoggerManager( logkit, null );
}
}
@@ -143,7 +143,7 @@
}
public void addGenerator(ComponentManager newManager,
- Object hint, Program generator)
+ Object hint, Program generator)
throws Exception {
try {
final ComponentHandler handler =
@@ -169,7 +169,7 @@
handler.dispose();
this.classManager.reinstantiate();
if (getLogger().isDebugEnabled()) {
- getLogger().debug("Removing " + handler.getClass().getName() + " for " + hint.toString());
+ getLogger().debug("Removing " + handler.getClass().getName() + " for " + hint);
}
}
}