Skip to content

Commit 1e51dad

Browse files
zieluzielu
committed
darcula alignment
updated revision
1 parent 0bb6b16 commit 1e51dad

27 files changed

+278
-152
lines changed

‎CVSToolBox.iml

Lines changed: 192 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,197 @@
1010
<orderEntry type="sourceFolder" forTests="false" />
1111
<orderEntry type="library" name="glazedlists" level="application" />
1212
</component>
13+
<component name="org.twodividedbyzero.idea.findbugs">
14+
<option name="_basePreferences">
15+
<map>
16+
<entry key="property.analysisEffortLevel" value="default" />
17+
<entry key="property.analyzeAfterCompile" value="false" />
18+
<entry key="property.annotationGutterIconEnabled" value="true" />
19+
<entry key="property.annotationSuppressWarningsClass" value="edu.umd.cs.findbugs.annotations.SuppressWarnings" />
20+
<entry key="property.annotationTextRangeMarkupEnabled" value="true" />
21+
<entry key="property.exportAsHtml" value="true" />
22+
<entry key="property.exportAsXml" value="true" />
23+
<entry key="property.exportBaseDir" value="" />
24+
<entry key="property.exportCreateArchiveDir" value="false" />
25+
<entry key="property.exportOpenBrowser" value="true" />
26+
<entry key="property.minPriorityToReport" value="Medium" />
27+
<entry key="property.runAnalysisInBackground" value="false" />
28+
<entry key="property.showHiddenDetectors" value="false" />
29+
<entry key="property.toolWindowToFront" value="true" />
30+
</map>
31+
</option>
32+
<option name="_detectors">
33+
<map>
34+
<entry key="AppendingToAnObjectOutputStream" value="true" />
35+
<entry key="AtomicityProblem" value="true" />
36+
<entry key="BadAppletConstructor" value="false" />
37+
<entry key="BadResultSetAccess" value="true" />
38+
<entry key="BadSyntaxForRegularExpression" value="true" />
39+
<entry key="BadUseOfReturnValue" value="true" />
40+
<entry key="BadlyOverriddenAdapter" value="true" />
41+
<entry key="BooleanReturnNull" value="true" />
42+
<entry key="BuildInterproceduralCallGraph" value="false" />
43+
<entry key="BuildObligationPolicyDatabase" value="true" />
44+
<entry key="CallToUnsupportedMethod" value="false" />
45+
<entry key="CalledMethods" value="true" />
46+
<entry key="CheckCalls" value="false" />
47+
<entry key="CheckExpectedWarnings" value="false" />
48+
<entry key="CheckImmutableAnnotation" value="true" />
49+
<entry key="CheckTypeQualifiers" value="true" />
50+
<entry key="CloneIdiom" value="true" />
51+
<entry key="ComparatorIdiom" value="true" />
52+
<entry key="ConfusedInheritance" value="true" />
53+
<entry key="ConfusionBetweenInheritedAndOuterMethod" value="true" />
54+
<entry key="CrossSiteScripting" value="true" />
55+
<entry key="DefaultEncodingDetector" value="true" />
56+
<entry key="DoInsideDoPrivileged" value="true" />
57+
<entry key="DontCatchIllegalMonitorStateException" value="true" />
58+
<entry key="DontIgnoreResultOfPutIfAbsent" value="true" />
59+
<entry key="DontUseEnum" value="true" />
60+
<entry key="DroppedException" value="true" />
61+
<entry key="DumbMethodInvocations" value="true" />
62+
<entry key="DumbMethods" value="true" />
63+
<entry key="DuplicateBranches" value="true" />
64+
<entry key="EmptyZipFileEntry" value="true" />
65+
<entry key="EqualsOperandShouldHaveClassCompatibleWithThis" value="true" />
66+
<entry key="ExplicitSerialization" value="true" />
67+
<entry key="FieldItemSummary" value="true" />
68+
<entry key="FinalizerNullsFields" value="true" />
69+
<entry key="FindBadCast2" value="true" />
70+
<entry key="FindBadForLoop" value="true" />
71+
<entry key="FindBugsSummaryStats" value="true" />
72+
<entry key="FindCircularDependencies" value="false" />
73+
<entry key="FindDeadLocalStores" value="true" />
74+
<entry key="FindDoubleCheck" value="true" />
75+
<entry key="FindEmptySynchronizedBlock" value="true" />
76+
<entry key="FindFieldSelfAssignment" value="true" />
77+
<entry key="FindFinalizeInvocations" value="true" />
78+
<entry key="FindFloatEquality" value="true" />
79+
<entry key="FindFloatMath" value="false" />
80+
<entry key="FindHEmismatch" value="true" />
81+
<entry key="FindInconsistentSync2" value="true" />
82+
<entry key="FindJSR166LockMonitorenter" value="true" />
83+
<entry key="FindLocalSelfAssignment2" value="true" />
84+
<entry key="FindMaskedFields" value="true" />
85+
<entry key="FindMismatchedWaitOrNotify" value="true" />
86+
<entry key="FindNakedNotify" value="true" />
87+
<entry key="FindNonSerializableStoreIntoSession" value="false" />
88+
<entry key="FindNonSerializableValuePassedToWriteObject" value="false" />
89+
<entry key="FindNonShortCircuit" value="true" />
90+
<entry key="FindNullDeref" value="true" />
91+
<entry key="FindNullDerefsInvolvingNonShortCircuitEvaluation" value="true" />
92+
<entry key="FindOpenStream" value="true" />
93+
<entry key="FindPuzzlers" value="true" />
94+
<entry key="FindRefComparison" value="true" />
95+
<entry key="FindReturnRef" value="true" />
96+
<entry key="FindRunInvocations" value="true" />
97+
<entry key="FindSelfComparison" value="true" />
98+
<entry key="FindSelfComparison2" value="true" />
99+
<entry key="FindSleepWithLockHeld" value="true" />
100+
<entry key="FindSpinLoop" value="true" />
101+
<entry key="FindSqlInjection" value="true" />
102+
<entry key="FindTwoLockWait" value="true" />
103+
<entry key="FindUncalledPrivateMethods" value="true" />
104+
<entry key="FindUnconditionalWait" value="true" />
105+
<entry key="FindUninitializedGet" value="true" />
106+
<entry key="FindUnrelatedTypesInGenericContainer" value="true" />
107+
<entry key="FindUnreleasedLock" value="true" />
108+
<entry key="FindUnsatisfiedObligation" value="true" />
109+
<entry key="FindUnsyncGet" value="true" />
110+
<entry key="FindUseOfNonSerializableValue" value="true" />
111+
<entry key="FindUselessControlFlow" value="true" />
112+
<entry key="FormatStringChecker" value="true" />
113+
<entry key="FunctionsThatMightBeMistakenForProcedures" value="true" />
114+
<entry key="HugeSharedStringConstants" value="true" />
115+
<entry key="IDivResultCastToDouble" value="true" />
116+
<entry key="IncompatMask" value="true" />
117+
<entry key="InconsistentAnnotations" value="true" />
118+
<entry key="InefficientMemberAccess" value="false" />
119+
<entry key="InefficientToArray" value="true" />
120+
<entry key="InfiniteLoop" value="true" />
121+
<entry key="InfiniteRecursiveLoop" value="true" />
122+
<entry key="InheritanceUnsafeGetResource" value="true" />
123+
<entry key="InitializationChain" value="true" />
124+
<entry key="InitializeNonnullFieldsInConstructor" value="true" />
125+
<entry key="InstantiateStaticClass" value="true" />
126+
<entry key="IntCast2LongAsInstant" value="true" />
127+
<entry key="InvalidJUnitTest" value="true" />
128+
<entry key="IteratorIdioms" value="true" />
129+
<entry key="LazyInit" value="true" />
130+
<entry key="LoadOfKnownNullValue" value="true" />
131+
<entry key="LostLoggerDueToWeakReference" value="true" />
132+
<entry key="MethodReturnCheck" value="true" />
133+
<entry key="Methods" value="true" />
134+
<entry key="MultithreadedInstanceAccess" value="true" />
135+
<entry key="MutableLock" value="true" />
136+
<entry key="MutableStaticFields" value="true" />
137+
<entry key="Naming" value="true" />
138+
<entry key="Noise" value="false" />
139+
<entry key="NoiseNullDeref" value="false" />
140+
<entry key="NoteAnnotationRetention" value="true" />
141+
<entry key="NoteCheckReturnValueAnnotations" value="true" />
142+
<entry key="NoteDirectlyRelevantTypeQualifiers" value="true" />
143+
<entry key="NoteJCIPAnnotation" value="true" />
144+
<entry key="NoteNonNullAnnotations" value="true" />
145+
<entry key="NoteNonnullReturnValues" value="true" />
146+
<entry key="NoteSuppressedWarnings" value="true" />
147+
<entry key="NoteUnconditionalParamDerefs" value="true" />
148+
<entry key="NumberConstructor" value="true" />
149+
<entry key="OverridingEqualsNotSymmetrical" value="true" />
150+
<entry key="PreferZeroLengthArrays" value="true" />
151+
<entry key="PublicSemaphores" value="false" />
152+
<entry key="QuestionableBooleanAssignment" value="true" />
153+
<entry key="ReadOfInstanceFieldInMethodInvokedByConstructorInSuperclass" value="true" />
154+
<entry key="ReadReturnShouldBeChecked" value="true" />
155+
<entry key="RedundantInterfaces" value="true" />
156+
<entry key="ReflectiveClasses" value="true" />
157+
<entry key="RepeatedConditionals" value="true" />
158+
<entry key="ResolveAllReferences" value="false" />
159+
<entry key="RuntimeExceptionCapture" value="true" />
160+
<entry key="SerializableIdiom" value="true" />
161+
<entry key="StartInConstructor" value="true" />
162+
<entry key="StaticCalendarDetector" value="true" />
163+
<entry key="StringConcatenation" value="true" />
164+
<entry key="SuperfluousInstanceOf" value="true" />
165+
<entry key="SuspiciousThreadInterrupted" value="true" />
166+
<entry key="SwitchFallthrough" value="true" />
167+
<entry key="SynchronizationOnSharedBuiltinConstant" value="true" />
168+
<entry key="SynchronizeAndNullCheckField" value="true" />
169+
<entry key="SynchronizeOnClassLiteralNotGetClass" value="true" />
170+
<entry key="SynchronizingOnContentsOfFieldToProtectField" value="true" />
171+
<entry key="TestASM" value="false" />
172+
<entry key="TestDataflowAnalysis" value="false" />
173+
<entry key="TestingGround" value="false" />
174+
<entry key="TestingGround2" value="false" />
175+
<entry key="TrainFieldStoreTypes" value="true" />
176+
<entry key="TrainLongInstantfParams" value="true" />
177+
<entry key="TrainNonNullAnnotations" value="true" />
178+
<entry key="TrainUnconditionalDerefParams" value="true" />
179+
<entry key="URLProblems" value="true" />
180+
<entry key="UncallableMethodOfAnonymousClass" value="true" />
181+
<entry key="UnnecessaryMath" value="true" />
182+
<entry key="UnreadFields" value="true" />
183+
<entry key="UselessSubclassMethod" value="false" />
184+
<entry key="VarArgsProblems" value="true" />
185+
<entry key="VolatileUsage" value="true" />
186+
<entry key="WaitInLoop" value="true" />
187+
<entry key="WrongMapIterator" value="true" />
188+
<entry key="XMLFactoryBypass" value="true" />
189+
</map>
190+
</option>
191+
<option name="_reportCategories">
192+
<map>
193+
<entry key="BAD_PRACTICE" value="true" />
194+
<entry key="CORRECTNESS" value="true" />
195+
<entry key="EXPERIMENTAL" value="true" />
196+
<entry key="I18N" value="true" />
197+
<entry key="MALICIOUS_CODE" value="true" />
198+
<entry key="MT_CORRECTNESS" value="true" />
199+
<entry key="PERFORMANCE" value="true" />
200+
<entry key="SECURITY" value="true" />
201+
<entry key="STYLE" value="true" />
202+
</map>
203+
</option>
204+
</component>
13205
</module>
14206

‎META-INF/license.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
CVSToolBox IntelliJ IDEA Plugin
22

3-
Copyright (C) 2011, Łukasz Zieliński
3+
Copyright (C) 2013, Łukasz Zieliński
44

55
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
66
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

‎META-INF/plugin.xml

Lines changed: 8 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,3 @@
1-
<!--
2-
~ CVSToolBox IntelliJ IDEA Plugin
3-
~
4-
~ Copyright (C) 2011, Łukasz Zieliński
5-
~
6-
~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
7-
~ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
8-
~ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
9-
~ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
10-
~ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
11-
~ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
12-
~ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
13-
~
14-
~ This plugin uses
15-
~ FAMFAMFAM Silk Icons http://www.famfamfam.com/lab/icons/silk
16-
-->
17-
181
<idea-plugin version="2" url="https://github.com/zielu/CVSToolBox">
192
<name>CVSToolBox</name>
203
<description>
@@ -35,7 +18,7 @@
3518
</description>
3619
<version>1.4.10</version>
3720
<vendor url="https://github.com/zielu/CVSToolBox" email="[email protected]">Łukasz Zieliński</vendor>
38-
<idea-version since-build="129.298" until-build="130.9999"/>
21+
<idea-version since-build="129.298" until-build="133.9999"/>
3922
<!-- dependencies -->
4023
<depends>CVS</depends>
4124
<category>VCS Integration</category>
@@ -74,85 +57,12 @@
7457
<!-- Add your extensions here -->
7558
<vcsCheckinHandlerFactory implementation="org.cvstoolbox.multitag.MultiTagCheckinHandlerFactory"/>
7659
</extensions>
77-
<change-notes>
78-
<![CDATA[
79-
<ul>
80-
<li><b>1.4.10</b>
81-
<ol>
82-
<li>Darcula alignment</li>
83-
</ol>
84-
</li>
85-
<li><b>1.4.9</b>
86-
<ol>
87-
<li>Do not tag files not under CVS</li>
88-
<li>Do not tag locally added but not committed files</li>
89-
<li>Do not tag locally deleted files</li>
90-
</ol>
91-
</li>
92-
<li><b>1.4.8</b>
93-
<ol>
94-
<li>Compatible with latest Idea 13 EAP (130.+)</li>
95-
</ol>
96-
</li>
97-
<li><b>1.4.7</b>
98-
<ol>
99-
<li>Compatible with latest Idea 12.1 (129.+)</li>
100-
</ol>
101-
</li>
102-
<li><b>1.4.6</b>
103-
<ol>
104-
<li>Compatible with latest Idea 12 EAP (123.+)</li>
105-
</ol>
106-
</li>
107-
<li><b>1.4.5</b>
108-
<ol>
109-
<li>Compatible with latest Idea 12 EAP (122.519+)</li>
110-
</ol>
111-
</li>
112-
<li><b>1.4.4</b>
113-
<ol>
114-
<li>Compatible with latest Idea 12 EAP (122.x)</li>
115-
</ol>
116-
</li>
117-
<li><b>1.4.3</b>
118-
<ol>
119-
<li>Compatible with latest Idea 12 EAP</li>
120-
</ol>
121-
</li>
122-
<li><b>1.4.2</b>
123-
<ol>
124-
<li>Compatible with latest Idea 11.1 RC</li>
125-
</ol>
126-
</li>
127-
<li><b>1.3</b>
128-
<ol>
129-
<li>Compatible with Idea 11</li>
130-
</ol>
131-
</li>
132-
<li><b>1.2</b>
133-
<ol>
134-
<li>'Delete Tags' context action</li>
135-
</ol>
136-
</li>
137-
<li><b>1.1</b>
138-
<ol>
139-
<li>'Create/Move branches' context action</li>
140-
</ol>
141-
</li>
142-
<li><b>1.01</b>
143-
<ol>
144-
<li>Fixed error in 'Multitag commited files' with empty directory</li>
145-
<li>Fixed exception when invoked in "Create patch' context</li>
146-
</ol>
147-
</li>
148-
<li><b>1.0</b>
149-
<ol>
150-
<li>Initial plugin release.</li>
151-
<li>'Create multiple tags' context action</li>
152-
<li>'Multitag commited files' after commit action</li>
153-
</ol>
154-
</li>
155-
</ul>
156-
]]>
60+
<change-notes><![CDATA[
61+
<h3>Changes in 1.4.10</h3>
62+
<ul>
63+
<li>Compatibility with Idea 13</li>
64+
<li>Darcula alignment</li>
65+
<ul>
66+
]]>
15767
</change-notes>
15868
</idea-plugin>

‎src/org/cvstoolbox/cvsoperations/TagsHelperEx.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/*
22
* CVSToolBox IntelliJ IDEA Plugin
33
*
4-
* Copyright (C) 2011, Łukasz Zieliński
4+
* Copyright (C) 2013, Łukasz Zieliński
55
*
6-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
6+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
7+
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
78
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
89
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
910
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
@@ -20,6 +21,9 @@
2021
*/
2122
package org.cvstoolbox.cvsoperations;
2223

24+
import java.util.ArrayList;
25+
import java.util.Collection;
26+
2327
import com.intellij.CvsBundle;
2428
import com.intellij.cvsSupport2.cvsExecution.CvsOperationExecutor;
2529
import com.intellij.cvsSupport2.cvsExecution.CvsOperationExecutorCallback;
@@ -35,9 +39,6 @@
3539
import com.intellij.openapi.vcs.FilePath;
3640
import com.intellij.openapi.vcs.VcsException;
3741

38-
import java.util.ArrayList;
39-
import java.util.Collection;
40-
4142
/**
4243
* @author Łukasz Zieliński
4344
*/

‎src/org/cvstoolbox/filter/Filters.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
/*
22
* CVSToolBox IntelliJ IDEA Plugin
33
*
4-
* Copyright (C) 2011, Łukasz Zieliński
4+
* Copyright (C) 2013, Łukasz Zieliński
55
*
6-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
6+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
7+
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
78
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
89
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
910
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

0 commit comments

Comments
 (0)