Skip to content

Commit bbea9fd

Browse files
committed
java-style: Remove import order check
Signed-off-by: Ce Gao <[email protected]>
1 parent 553a663 commit bbea9fd

File tree

5 files changed

+20
-15
lines changed

5 files changed

+20
-15
lines changed

java-style.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@
158158
</module>
159159
<module name="OverloadMethodsDeclarationOrder"/>
160160
<module name="VariableDeclarationUsageDistance"/>
161-
<module name="CustomImportOrder">
161+
<!--<module name="CustomImportOrder">
162162
<property name="specialImportsRegExp" value="com.google"/>
163163
<property name="sortImportsInGroupAlphabetically" value="true"/>
164164
<property name="customImportOrderRules" value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
165-
</module>
165+
</module>-->
166166
<module name="MethodParamPad"/>
167167
<module name="OperatorWrap">
168168
<property name="option" value="NL"/>
@@ -176,26 +176,26 @@
176176
<property name="allowSamelineMultipleAnnotations" value="true"/>
177177
</module>
178178
<!--<module name="NonEmptyAtclauseDescription"/>-->
179-
<module name="JavadocTagContinuationIndentation"/>
180-
<module name="SummaryJavadoc">
179+
<!--<module name="JavadocTagContinuationIndentation"/>-->
180+
<!--<module name="SummaryJavadoc">
181181
<property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
182-
</module>
183-
<module name="JavadocParagraph"/>
182+
</module>-->
183+
<!--<module name="JavadocParagraph"/>-->
184184
<module name="AtclauseOrder">
185185
<property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
186186
<property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
187187
</module>
188-
<module name="JavadocMethod">
188+
<!--<module name="JavadocMethod">
189189
<property name="scope" value="public"/>
190190
<property name="allowMissingParamTags" value="true"/>
191191
<property name="allowMissingThrowsTags" value="true"/>
192192
<property name="allowMissingReturnTag" value="true"/>
193193
<property name="minLineCount" value="2"/>
194194
<property name="allowedAnnotations" value="Override, Test"/>
195195
<property name="allowThrowsTagsForSubclasses" value="true"/>
196-
</module>
196+
</module>-->
197197
<module name="MethodName">
198-
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
198+
<property name="format" value="^[a-z0-9][a-zA-Z0-9_]*$"/>
199199
<message key="name.invalidPattern"
200200
value="Method name ''{0}'' must match pattern ''{1}''."/>
201201
</module>

src/rprocessing/Runner.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package rprocessing;
22

33
import org.renjin.eval.EvalException;
4-
import org.renjin.parser.ParseException;
5-
64
import rprocessing.exception.NotFoundException;
75
import rprocessing.exception.REvalException;
86
import rprocessing.lancher.StandaloneSketch;
@@ -20,8 +18,8 @@ public class Runner {
2018
public static RunnableSketch sketch;
2119

2220
@SuppressWarnings("unused")
23-
private static final String CORE_TEXT = RScriptReader
24-
.readResourceAsText(Runner.class, "r/core.R");
21+
private static final String CORE_TEXT =
22+
RScriptReader.readResourceAsText(Runner.class, "r/core.R");
2523

2624
private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("VERBOSE_RLANG_MODE"));
2725

@@ -55,7 +53,8 @@ public static synchronized void runSketchBlocking(final RunnableSketch sketch,
5553

5654
public static synchronized void runSketchBlocking(final RunnableSketch sketch,
5755
final Printer stdout, final Printer stderr,
58-
final SketchPositionListener sketchPositionListener) throws REvalException, NotFoundException {
56+
final SketchPositionListener sketchPositionListener)
57+
throws REvalException, NotFoundException {
5958
final String[] args = sketch.getPAppletArguments();
6059

6160
log("Tring to initialize RLangPApplet.");

src/rprocessing/mode/RLangInputHandler.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,10 @@ public boolean handlePressed(KeyEvent event) {
7373

7474
// things that change the content of the text area
7575
if (!event.isMetaDown()
76-
&& (code == KeyEvent.VK_BACK_SPACE || code == KeyEvent.VK_TAB || code == KeyEvent.VK_ENTER || isPrintableChar(c))) {
76+
&& (code == KeyEvent.VK_BACK_SPACE
77+
|| code == KeyEvent.VK_TAB
78+
|| code == KeyEvent.VK_ENTER
79+
|| isPrintableChar(c))) {
7780
sketch.setModified(true);
7881
}
7982

src/rprocessing/mode/run/RMIUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public static Registry registry() throws RemoteException {
5151
try {
5252
return LocateRegistry.createRegistry(RMI_PORT);
5353
} catch (final RemoteException exception) {
54+
log(exception.toString());
5455
}
5556
return LocateRegistry.getRegistry(RMI_PORT);
5657
}
@@ -71,6 +72,7 @@ public void run() {
7172
log("Unbinding " + registryKey + " from registry.");
7273
registry().unbind(registryKey);
7374
} catch (final Exception exception) {
75+
log(exception.toString());
7476
}
7577
}
7678
}));

src/rprocessing/mode/run/SketchServiceRunner.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ public void shutdown() {
215215
try {
216216
sketchService.shutdown();
217217
} catch (final RemoteException exception) {
218+
log(exception.toString());
218219
}
219220
}
220221
if (sketchServiceRunner != null) {

0 commit comments

Comments
 (0)