This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 57941
Collapse All | Expand All

(-)build.xml (-35 / +51 lines)
Lines 232-284 Link Here
232
  -->
232
  -->
233
  <target name="do-lib-javac-localdir" if="localdir">
233
  <target name="do-lib-javac-localdir" if="localdir">
234
    <mkdir dir="${destdir}"/>
234
    <mkdir dir="${destdir}"/>
235
    <javac sourcepath="" destdir="${destdir}" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
235
    <mkdir dir="${localdir}"/>
236
      <src path="src" />
236
    
237
      <src path="${localdir}" />
237
    <taskdef name="jalopy"
238
      <selector>
238
         classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
239
        <or>
239
      <classpath>
240
          <selector refid="${selector}" />
240
        <fileset dir="/usr/share/java/">
241
          <filename name="${include}" />
241
          <include name="*.jar" />
242
          <filename name="org/netbeans/modules/openide/**/*.java" />
242
        </fileset>
243
        </or>
243
      </classpath>
244
      </selector>
244
    </taskdef>
245
      <classpath refid="classpath" />
245
    
246
    </javac>
246
    <copy todir="${localdir}" >
247
    <!-- copy non-java files into new direction -->
248
    <copy todir="${destdir}" >
249
      <fileset dir="src" >
247
      <fileset dir="src" >
250
        <selector refid="${selector}" />
248
        <selector refid="${selector}" />
251
        <exclude name="**/*.java" />
252
        <exclude name="**/*.class" />
249
        <exclude name="**/*.class" />
250
        <exclude name="**/*.java" />
253
      </fileset>
251
      </fileset>
254
    </copy>
252
    </copy>
253
254
    <!--
255
    
256
   <jalopy fileformat="unix"
257
            convention="http://www.foo.com/myConvention.xml"
258
            history="file"
259
            historymethod="adler32"
260
            loglevel="info"
261
            threads="2"
262
            destdir="${localdir}"
263
            classpathref="classpath">
264
    
265
    -->
266
   <jalopy fileformat="unix"
267
            convention="convention-netbeans.xml"
268
            history="file"
269
            historymethod="adler32"
270
            loglevel="info"
271
            threads="2"
272
            destdir="${localdir}"
273
            classpathref="classpath">
274
      <fileset dir="src" >
275
        <selector>
276
            <and>
277
                <selector refid="${selector}" />
278
                <filename name="**/*.java" />
279
            </and>
280
        </selector>
281
      </fileset>
282
    </jalopy>  
283
    
284
    <javac sourcepath="" destdir="${destdir}" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
285
      <src path="${localdir}" />
286
      <classpath refid="classpath" />
287
    </javac>
288
    
255
    <copy todir="${destdir}">
289
    <copy todir="${destdir}">
256
      <fileset dir="${localdir}">
290
      <fileset dir="${localdir}">
257
        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
291
        <excludesfile name="${nbroot}/nbbuild/standard-jar-excludes.txt"/>
258
      </fileset>
292
      </fileset>
259
    </copy>
293
    </copy>
260
  </target>
294
  </target>
295
  
261
  <target name="do-lib-javac-nolocaldir" unless="localdir">
296
  <target name="do-lib-javac-nolocaldir" unless="localdir">
262
    <mkdir dir="${destdir}"/>
297
    <fail message="There has to be localdir" />
263
    <javac sourcepath="" destdir="${destdir}" deprecation="${build.compiler.deprecation}" debug="${build.compiler.debug}" source="1.4">
264
      <src path="src" />
265
      <selector>
266
        <or>
267
          <selector refid="${selector}" />
268
          <filename name="${include}" />
269
          <filename name="org/netbeans/modules/openide/**/*.java" />
270
        </or>
271
      </selector>
272
      <classpath refid="classpath" />
273
    </javac>
274
    <!-- copy non-java files into new direction -->
275
    <copy todir="${destdir}" >
276
      <fileset dir="src" >
277
        <selector refid="${selector}" />
278
        <exclude name="**/*.java" />
279
        <exclude name="**/*.class" />
280
      </fileset>
281
    </copy>
282
  </target>
298
  </target>
283
  <target name="do-lib-javac" depends="do-lib-javac-localdir,do-lib-javac-nolocaldir"/>
299
  <target name="do-lib-javac" depends="do-lib-javac-localdir,do-lib-javac-nolocaldir"/>
284
300
(-)convention-netbeans.xml (+300 lines)
Added Link Here
1
<?xml version="1.0" encoding="UTF-8"?>
2
<jalopy>
3
  <general>
4
    <compliance>
5
      <version>14</version>
6
    </compliance>
7
    <style>
8
      <description>Sun Java Coding Convention</description>
9
      <name>Sun</name>
10
    </style>
11
  </general>
12
  <internal>
13
    <version>6</version>
14
  </internal>
15
  <misc>
16
    <threadCount>1</threadCount>
17
  </misc>
18
  <printer>
19
    <alignment>
20
      <methodCallChain>true</methodCallChain>
21
      <parameterMethodDeclaration>false</parameterMethodDeclaration>
22
      <ternaryOperator>true</ternaryOperator>
23
      <variableAssignment>false</variableAssignment>
24
      <variableIdentifier>false</variableIdentifier>
25
    </alignment>
26
    <backup>
27
      <directory>bak</directory>
28
      <level>0</level>
29
    </backup>
30
    <blanklines>
31
      <after>
32
        <block>1</block>
33
        <braceLeft>0</braceLeft>
34
        <class>1</class>
35
        <declaration>0</declaration>
36
        <footer>1</footer>
37
        <header>0</header>
38
        <interface>1</interface>
39
        <lastImport>2</lastImport>
40
        <method>1</method>
41
        <package>1</package>
42
      </after>
43
      <before>
44
        <block>1</block>
45
        <braceRight>0</braceRight>
46
        <caseBlock>1</caseBlock>
47
        <comment>
48
          <javadoc>1</javadoc>
49
          <multiline>1</multiline>
50
          <singleline>1</singleline>
51
        </comment>
52
        <controlStatement>1</controlStatement>
53
        <declaration>1</declaration>
54
        <footer>0</footer>
55
        <header>0</header>
56
      </before>
57
      <keepUpTo>1</keepUpTo>
58
    </blanklines>
59
    <braces>
60
      <empty>
61
        <cuddle>false</cuddle>
62
        <insertStatement>false</insertStatement>
63
      </empty>
64
      <insert>
65
        <dowhile>true</dowhile>
66
        <for>true</for>
67
        <ifelse>true</ifelse>
68
        <while>true</while>
69
      </insert>
70
      <remove>
71
        <block>true</block>
72
        <dowhile>false</dowhile>
73
        <for>false</for>
74
        <ifelse>false</ifelse>
75
        <while>false</while>
76
      </remove>
77
      <treatDifferent>
78
        <methodClass>false</methodClass>
79
        <methodClassIfWrapped>false</methodClassIfWrapped>
80
      </treatDifferent>
81
    </braces>
82
    <chunks>
83
      <blanklines>true</blanklines>
84
      <comments>true</comments>
85
    </chunks>
86
    <comments>
87
      <format>
88
        <multiline>false</multiline>
89
      </format>
90
      <javadoc>
91
        <check>
92
          <innerclass>false</innerclass>
93
          <tags>false</tags>
94
          <throwsTags>false</throwsTags>
95
        </check>
96
        <fieldsShort>true</fieldsShort>
97
        <generate>
98
          <class>0</class>
99
          <constructor>0</constructor>
100
          <field>0</field>
101
          <method>0</method>
102
        </generate>
103
        <parseComments>false</parseComments>
104
        <tags>
105
          <in-line />
106
          <standard />
107
        </tags>
108
        <templates>
109
          <method>
110
            <bottom>*/</bottom>
111
            <exception>* @throws $exceptionType$ DOCUMENT ME!</exception>
112
            <param>* @param $paramType$ DOCUMENT ME!</param>
113
            <return>* @return DOCUMENT ME!</return>
114
            <top>/**| * DOCUMENT ME!</top>
115
          </method>
116
        </templates>
117
      </javadoc>
118
      <remove>
119
        <javadoc>false</javadoc>
120
        <multiline>false</multiline>
121
        <singleline>false</singleline>
122
      </remove>
123
      <separator>
124
        <fillCharacter>-</fillCharacter>
125
        <insert>false</insert>
126
        <insertRecursive>false</insertRecursive>
127
        <text>
128
          <class>Inner Classes</class>
129
          <constructor>Constructors</constructor>
130
          <field>Instance fields</field>
131
          <initializer>Instance initializers</initializer>
132
          <interface>Inner Interfaces</interface>
133
          <method>Methods</method>
134
          <static>Static fields/initializers</static>
135
        </text>
136
      </separator>
137
    </comments>
138
    <environment />
139
    <footer>
140
      <keys />
141
      <smartMode>0</smartMode>
142
      <use>false</use>
143
    </footer>
144
    <header>
145
      <keys />
146
      <smartMode>0</smartMode>
147
      <use>false</use>
148
    </header>
149
    <history>
150
      <policy>disabled</policy>
151
    </history>
152
    <imports>
153
      <grouping>
154
        <defaultDepth>3</defaultDepth>
155
        <packages>*:0|gnu:2|java:2|javax:2</packages>
156
      </grouping>
157
      <policy>disabled</policy>
158
      <sort>true</sort>
159
    </imports>
160
    <indentation>
161
      <caseFromSwitch>false</caseFromSwitch>
162
      <continuation>
163
        <block>true</block>
164
        <operator>false</operator>
165
      </continuation>
166
      <firstColumnComments>true</firstColumnComments>
167
      <label>false</label>
168
      <policy>
169
        <deep>false</deep>
170
      </policy>
171
      <sizes>
172
        <braceCuddled>1</braceCuddled>
173
        <braceLeft>1</braceLeft>
174
        <braceRight>0</braceRight>
175
        <braceRightAfter>1</braceRightAfter>
176
        <continuation>4</continuation>
177
        <deep>55</deep>
178
        <extends>0</extends>
179
        <general>4</general>
180
        <implements>0</implements>
181
        <leading>0</leading>
182
        <tabs>8</tabs>
183
        <throws>0</throws>
184
        <trailingComment>1</trailingComment>
185
      </sizes>
186
      <tabs>
187
        <enable>false</enable>
188
        <onlyLeading>false</onlyLeading>
189
      </tabs>
190
    </indentation>
191
    <misc>
192
      <arrayBracketsAfterIdent>false</arrayBracketsAfterIdent>
193
      <forceFormatting>false</forceFormatting>
194
      <insertExpressionParentheses>true</insertExpressionParentheses>
195
      <insertLoggingConditional>false</insertLoggingConditional>
196
      <insertTrailingNewline>true</insertTrailingNewline>
197
      <insertUID>false</insertUID>
198
    </misc>
199
    <sorting>
200
      <declaration>
201
        <class>false</class>
202
        <constructor>false</constructor>
203
        <enable>true</enable>
204
        <interface>false</interface>
205
        <method>false</method>
206
        <order>static|field|initializer|constructor|method|interface|class</order>
207
        <variable>false</variable>
208
      </declaration>
209
      <modifier>
210
        <enable>false</enable>
211
        <order>public|protected|private|abstract|static|final|synchronized|transient|volatile|native|strictfp</order>
212
      </modifier>
213
    </sorting>
214
    <whitespace>
215
      <after>
216
        <comma>true</comma>
217
        <semicolon>true</semicolon>
218
        <typeCast>true</typeCast>
219
      </after>
220
      <before>
221
        <braces>true</braces>
222
        <brackets>false</brackets>
223
        <bracketsTypes>false</bracketsTypes>
224
        <caseColon>false</caseColon>
225
        <operator>
226
          <not>false</not>
227
        </operator>
228
        <parentheses>
229
          <methodCall>false</methodCall>
230
          <methodDeclaration>false</methodDeclaration>
231
          <statement>true</statement>
232
        </parentheses>
233
      </before>
234
      <padding>
235
        <braces>true</braces>
236
        <brackets>false</brackets>
237
        <operator>
238
          <assignment>true</assignment>
239
          <bitwise>true</bitwise>
240
          <logical>true</logical>
241
          <mathematical>true</mathematical>
242
          <relational>true</relational>
243
          <shift>true</shift>
244
        </operator>
245
        <parenthesis>false</parenthesis>
246
        <typeCast>false</typeCast>
247
      </padding>
248
    </whitespace>
249
    <wrapping>
250
      <always>
251
        <after>
252
          <arrayElement>0</arrayElement>
253
          <braceRight>false</braceRight>
254
          <extendsTypes>false</extendsTypes>
255
          <implementsTypes>false</implementsTypes>
256
          <label>true</label>
257
          <methodCallChained>false</methodCallChained>
258
          <ternaryOperator>
259
            <first>false</first>
260
            <second>false</second>
261
          </ternaryOperator>
262
          <throwsTypes>false</throwsTypes>
263
        </after>
264
        <before>
265
          <braceLeft>false</braceLeft>
266
          <extends>false</extends>
267
          <implements>true</implements>
268
          <throws>false</throws>
269
        </before>
270
        <parameter>
271
          <methodCall>false</methodCall>
272
          <methodCallNested>false</methodCallNested>
273
          <methodDeclaration>false</methodDeclaration>
274
        </parameter>
275
      </always>
276
      <general>
277
        <beforeOperator>false</beforeOperator>
278
        <enable>true</enable>
279
        <lineLength>80</lineLength>
280
      </general>
281
      <ondemand>
282
        <after>
283
          <assignment>false</assignment>
284
          <leftParenthesis>true</leftParenthesis>
285
          <parameter>false</parameter>
286
          <types>
287
            <extends>false</extends>
288
            <implements>false</implements>
289
            <throws>false</throws>
290
          </types>
291
        </after>
292
        <before>
293
          <rightParenthesis>true</rightParenthesis>
294
        </before>
295
        <groupingParentheses>false</groupingParentheses>
296
      </ondemand>
297
    </wrapping>
298
  </printer>
299
</jalopy>
300
(-)actions/build.xml (+1 lines)
Lines 29-34 Link Here
29
  
29
  
30
  <target name="compile" >
30
  <target name="compile" >
31
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
31
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
32
      <property name="localdir" location="src" />
32
      <property name="destdir" location="build/classes"/>
33
      <property name="destdir" location="build/classes"/>
33
      <property name="selector" value="openide.actions" />
34
      <property name="selector" value="openide.actions" />
34
    </ant>
35
    </ant>
(-)compat/build.xml (+1 lines)
Lines 30-35 Link Here
30
  
30
  
31
  <target name="compile" depends="init">
31
  <target name="compile" depends="init">
32
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
32
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
33
      <property name="localdir" location="src" />
33
      <property name="destdir" location="build/classes"/>
34
      <property name="destdir" location="build/classes"/>
34
      <property name="selector" value="openide.compat" />
35
      <property name="selector" value="openide.compat" />
35
    </ant>
36
    </ant>
(-)dialogs/build.xml (+1 lines)
Lines 22-27 Link Here
22
  
22
  
23
  <target name="compile" >
23
  <target name="compile" >
24
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
24
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
25
      <property name="localdir" location="src" />
25
      <property name="destdir" location="build/classes"/>
26
      <property name="destdir" location="build/classes"/>
26
      <property name="selector" value="openide.dialogs" />
27
      <property name="selector" value="openide.dialogs" />
27
    </ant>
28
    </ant>
(-)fs/build.xml (+1 lines)
Lines 23-28 Link Here
23
  
23
  
24
  <target name="compile" depends="init">
24
  <target name="compile" depends="init">
25
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
25
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
26
      <property name="localdir" location="src" />
26
      <property name="destdir" location="build/classes"/>
27
      <property name="destdir" location="build/classes"/>
27
      <property name="selector" value="openide.fs" />
28
      <property name="selector" value="openide.fs" />
28
    </ant>
29
    </ant>
(-)modules/build.xml (+1 lines)
Lines 21-26 Link Here
21
21
22
  <target name="compile" >
22
  <target name="compile" >
23
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
23
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
24
      <property name="localdir" location="src" />
24
      <property name="destdir" location="build/classes"/>
25
      <property name="destdir" location="build/classes"/>
25
      <property name="selector" value="openide.modules" />
26
      <property name="selector" value="openide.modules" />
26
    </ant>
27
    </ant>
(-)nodes/build.xml (+1 lines)
Lines 25-30 Link Here
25
  
25
  
26
  <target name="compile" depends="init">
26
  <target name="compile" depends="init">
27
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
27
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
28
      <property name="localdir" location="src" />
28
      <property name="destdir" location="build/classes"/>
29
      <property name="destdir" location="build/classes"/>
29
      <property name="selector" value="openide.nodes" />
30
      <property name="selector" value="openide.nodes" />
30
    </ant>
31
    </ant>
(-)options/build.xml (+1 lines)
Lines 21-26 Link Here
21
    
21
    
22
  <target name="compile" >
22
  <target name="compile" >
23
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
23
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
24
      <property name="localdir" location="src" />
24
      <property name="destdir" location="build/classes"/>
25
      <property name="destdir" location="build/classes"/>
25
      <property name="selector" value="openide.options" />
26
      <property name="selector" value="openide.options" />
26
    </ant>
27
    </ant>
(-)text/build.xml (+1 lines)
Lines 28-33 Link Here
28
  
28
  
29
  <target name="compile" depends="init">
29
  <target name="compile" depends="init">
30
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
30
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
31
      <property name="localdir" location="src" />
31
      <property name="destdir" location="build/classes"/>
32
      <property name="destdir" location="build/classes"/>
32
      <property name="selector" value="openide.text" />
33
      <property name="selector" value="openide.text" />
33
    </ant>
34
    </ant>
(-)util/enum/build.xml (+1 lines)
Lines 21-26 Link Here
21
  
21
  
22
  <target name="compile" depends="init">
22
  <target name="compile" depends="init">
23
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
23
    <ant dir="${nbroot}/openide" target="do-lib-javac" inheritRefs="true" >
24
      <property name="localdir" location="src" />
24
      <property name="destdir" location="build/classes"/>
25
      <property name="destdir" location="build/classes"/>
25
      <!-- <property name="localdir" location="src" /> -->
26
      <!-- <property name="localdir" location="src" /> -->
26
      <property name="selector" value="openide.util.enum" />
27
      <property name="selector" value="openide.util.enum" />

Return to bug 57941