You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by pe...@apache.org on 2006/11/18 19:10:35 UTC
svn commit: r476578 - in
/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic:
DefaultRmicAdapter.java KaffeRmic.java RmicAdapter.java
RmicAdapterFactory.java XNewRmic.java
Author: peterreilly
Date: Sat Nov 18 10:10:35 2006
New Revision: 476578
URL: http://svn.apache.org/viewvc?view=rev&rev=476578
Log:
checkstyle
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java?view=diff&rev=476578&r1=476577&r2=476578
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/DefaultRmicAdapter.java Sat Nov 18 10:10:35 2006
@@ -45,8 +45,11 @@
public static final String RMI_SKEL_SUFFIX = "_Skel";
/** suffix denoting a tie file */
public static final String RMI_TIE_SUFFIX = "_Tie";
+ /** arg for compat */
public static final String STUB_COMPAT = "-vcompat";
+ /** arg for 1.1 */
public static final String STUB_1_1 = "-v1.1";
+ /** arg for 1.2 */
public static final String STUB_1_2 = "-v1.2";
/**
@@ -209,9 +212,9 @@
}
//for java1.5+, we generate compatible stubs, that is, unless
//the caller asked for IDL or IIOP support.
- if (stubOption == null &&
- !attributes.getIiop() &&
- !attributes.getIdl()) {
+ if (stubOption == null
+ && !attributes.getIiop()
+ && !attributes.getIdl()) {
stubOption = STUB_COMPAT;
}
if (stubOption != null) {
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java?view=diff&rev=476578&r1=476577&r2=476578
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/KaffeRmic.java Sat Nov 18 10:10:35 2006
@@ -43,7 +43,7 @@
*/
public static final String COMPILER_NAME = "kaffe";
-
+ /** {@inheritDoc} */
public boolean execute() throws BuildException {
getRmic().log("Using Kaffe rmic", Project.MSG_VERBOSE);
Commandline cmd = setupRmicCommand();
@@ -96,6 +96,7 @@
try {
return Class.forName(RMIC_CLASSNAMES[i]);
} catch (ClassNotFoundException cnfe) {
+ // Ignore
}
}
return null;
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java?view=diff&rev=476578&r1=476577&r2=476578
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapter.java Sat Nov 18 10:10:35 2006
@@ -45,9 +45,9 @@
void setRmic(Rmic attributes);
/**
- * Executes the task.
+ * Call the rmic compiler.
*
- * @return has the compilation been successful
+ * @return true if has the compilation been successful
* @throws BuildException on error
*/
boolean execute() throws BuildException;
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java?view=diff&rev=476578&r1=476577&r2=476578
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/RmicAdapterFactory.java Sat Nov 18 10:10:35 2006
@@ -20,7 +20,6 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
-import org.apache.tools.ant.taskdefs.Rmic;
import org.apache.tools.ant.util.ClasspathUtils;
import java.util.Locale;
Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java?view=diff&rev=476578&r1=476577&r2=476578
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/rmic/XNewRmic.java Sat Nov 18 10:10:35 2006
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
package org.apache.tools.ant.taskdefs.rmic;
import org.apache.tools.ant.types.Commandline;
@@ -16,6 +33,7 @@
*/
public static final String COMPILER_NAME = "xnew";
+ /** No-arg constructor. */
public XNewRmic() {
}
@@ -24,7 +42,7 @@
* @return a command line that hands off to thw
*/
protected Commandline setupRmicCommand() {
- String options[] = new String[] {
+ String[] options = new String[] {
"-Xnew"
};
Commandline commandline = super.setupRmicCommand(options);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org