diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpCompletionContributor.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpCompletionContributor.java index 4e7f6929b5bf..9330f028a553 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpCompletionContributor.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpCompletionContributor.java @@ -21,7 +21,6 @@ import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.codeInsight.lookup.TailTypeDecorator; import com.intellij.patterns.ElementPattern; -import static com.intellij.patterns.PlatformPatterns.psiElement; import com.intellij.psi.PsiElement; import com.intellij.util.Icons; import com.intellij.util.ProcessingContext; @@ -32,12 +31,10 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; +import static com.intellij.patterns.PlatformPatterns.psiElement; + /** - * Created by IntelliJ IDEA. - * User: vnikolaenko - * Date: 22.09.2008 - * Time: 12:14:14 - * To change this template use File | Settings | File Templates. + * @author vnikolaenko */ public class RegExpCompletionContributor extends CompletionContributor { private static final Icon emptyIcon = new EmptyIcon(Icons.PROPERTY_ICON.getIconWidth(), Icons.PROPERTY_ICON.getIconHeight()); diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpDocumentationProvider.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpDocumentationProvider.java index 1106b4805b08..eba87b3c1383 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpDocumentationProvider.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpDocumentationProvider.java @@ -26,11 +26,7 @@ import org.intellij.lang.regexp.psi.impl.RegExpPropertyImpl; import org.jetbrains.annotations.Nullable; /** - * Created by IntelliJ IDEA. - * User: vnikolaenko - * Date: 17.09.2008 - * Time: 19:24:29 - * To change this template use File | Settings | File Templates. + * @author vnikolaenko */ public class RegExpDocumentationProvider extends QuickDocumentationProvider { @Override diff --git a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/InsetsPropertyCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/InsetsPropertyCodeGenerator.java index dbc93a94cb3f..3ecabe8118fe 100644 --- a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/InsetsPropertyCodeGenerator.java +++ b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/InsetsPropertyCodeGenerator.java @@ -15,24 +15,20 @@ */ package com.intellij.uiDesigner.compiler; +import org.objectweb.asm.Type; import org.objectweb.asm.commons.GeneratorAdapter; import org.objectweb.asm.commons.Method; -import org.objectweb.asm.Type; import java.awt.*; /** - * Created by IntelliJ IDEA. - * User: yole - * Date: 22.11.2005 - * Time: 17:46:41 - * To change this template use File | Settings | File Templates. + * @author yole */ public class InsetsPropertyCodeGenerator extends PropertyCodeGenerator { private final Type myInsetsType = Type.getType(Insets.class); public void generatePushValue(final GeneratorAdapter generator, final Object value) { - final Insets insets = (Insets) value; + final Insets insets = (Insets)value; generator.newInstance(myInsetsType); generator.dup(); generator.push(insets.top); diff --git a/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/GridBagConverterTest.java b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/GridBagConverterTest.java index 65cd0c6e523f..1785247b0763 100644 --- a/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/GridBagConverterTest.java +++ b/java/compiler/forms-compiler/testSrc/com/intellij/uiDesigner/core/GridBagConverterTest.java @@ -22,11 +22,7 @@ import javax.swing.*; import java.awt.*; /** - * Created by IntelliJ IDEA. - * User: yole - * Date: 23.11.2005 - * Time: 13:47:38 - * To change this template use File | Settings | File Templates. + * @author yole */ public class GridBagConverterTest extends TestCase { /** @@ -892,7 +888,7 @@ public class GridBagConverterTest extends TestCase { assertEquals(100, field3.getHeight()); } - private void applyConversionResults(final JPanel panel, final GridBagConverter converter) { + private static void applyConversionResults(final JPanel panel, final GridBagConverter converter) { GridBagConverter.Result[] results = converter.convert(); for(int i=0; i myEventContexts = new LinkedList(); - // contexts, paused at breakpoint or another debugger event requests. Note that thread, explicitly paused by user is not considered as - // "paused at breakpoint" and JDI prohibits data queries on its stackframes + /** + * contexts, paused at breakpoint or another debugger event requests. Note that thread, explicitly paused by user is not considered as + * "paused at breakpoint" and JDI prohibits data queries on its stackframes + */ private final LinkedList myPausedContexts = new LinkedList(); private final Set myFrozenThreads = Collections.synchronizedSet(new HashSet()); diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluateRuntimeException.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluateRuntimeException.java index 2a83a82ae8cd..a5b460cebc5d 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluateRuntimeException.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluateRuntimeException.java @@ -15,16 +15,10 @@ */ package com.intellij.debugger.engine.evaluation; -import com.intellij.debugger.engine.evaluation.EvaluateException; - /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Jan 14, 2004 - * Time: 2:18:59 PM - * To change this template use File | Settings | File Templates. + * @author lex */ -public class EvaluateRuntimeException extends RuntimeException{ +public class EvaluateRuntimeException extends RuntimeException { public EvaluateRuntimeException(EvaluateException e) { super(e); } diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluationListener.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluationListener.java index f6144f3142af..a9bfa83fdade 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluationListener.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/EvaluationListener.java @@ -20,13 +20,10 @@ import com.intellij.debugger.engine.SuspendContextImpl; import java.util.EventListener; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Feb 3, 2004 - * Time: 7:19:30 PM - * To change this template use File | Settings | File Templates. + * @author lex */ -public interface EvaluationListener extends EventListener{ - public void evaluationStarted(SuspendContextImpl context); - public void evaluationFinished(SuspendContextImpl context); +public interface EvaluationListener extends EventListener { + void evaluationStarted(SuspendContextImpl context); + + void evaluationFinished(SuspendContextImpl context); } diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/AssignmentEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/AssignmentEvaluator.java index b1cbe2534eab..9bbdf1a0f89a 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/AssignmentEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/AssignmentEvaluator.java @@ -22,11 +22,7 @@ import com.intellij.debugger.engine.evaluation.EvaluationContextImpl; import com.sun.jdi.*; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Mar 24, 2004 - * Time: 11:10:41 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public class AssignmentEvaluator implements Evaluator{ private final Evaluator myLeftEvaluator; diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BlockStatementEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BlockStatementEvaluator.java index d68eb235063e..464aa6ea4f35 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BlockStatementEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BlockStatementEvaluator.java @@ -15,19 +15,14 @@ */ package com.intellij.debugger.engine.evaluation.expression; +import com.intellij.debugger.engine.evaluation.EvaluateException; import com.intellij.debugger.engine.evaluation.EvaluationContextImpl; -import com.intellij.debugger.engine.evaluation.EvaluateException; -import com.intellij.debugger.engine.evaluation.EvaluateException; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 20, 2004 - * Time: 5:21:10 PM - * To change this template use File | Settings | File Templates. + * @author lex */ -public class BlockStatementEvaluator implements Evaluator{ - protected Evaluator [] myStatements; +public class BlockStatementEvaluator implements Evaluator { + protected Evaluator[] myStatements; public BlockStatementEvaluator(Evaluator[] statements) { myStatements = statements; @@ -35,8 +30,7 @@ public class BlockStatementEvaluator implements Evaluator{ public Object evaluate(EvaluationContextImpl context) throws EvaluateException { Object result = context.getSuspendContext().getDebugProcess().getVirtualMachineProxy().mirrorOf(); - for (int i = 0; i < myStatements.length; i++) { - Evaluator statement = myStatements[i]; + for (Evaluator statement : myStatements) { result = statement.evaluate(context); } return result; diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BreakContinueStatementEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BreakContinueStatementEvaluator.java index 40df7ed7189a..e65a3225d2ae 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BreakContinueStatementEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BreakContinueStatementEvaluator.java @@ -18,13 +18,12 @@ package com.intellij.debugger.engine.evaluation.expression; import com.intellij.debugger.engine.evaluation.EvaluationContextImpl; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 20, 2004 - * Time: 7:27:10 PM - * To change this template use File | Settings | File Templates. + * @author lex */ -public abstract class BreakContinueStatementEvaluator implements Evaluator{ +public class BreakContinueStatementEvaluator { + private BreakContinueStatementEvaluator() { + } + public static Evaluator createBreakEvaluator(final String labelName) { return new Evaluator() { public Object evaluate(EvaluationContextImpl context) throws BreakException { diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BreakException.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BreakException.java index 337a9468eca4..24a7fe5f502c 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BreakException.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/BreakException.java @@ -15,15 +15,11 @@ */ package com.intellij.debugger.engine.evaluation.expression; -import com.intellij.debugger.engine.evaluation.EvaluateException; import com.intellij.debugger.DebuggerBundle; +import com.intellij.debugger.engine.evaluation.EvaluateException; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 20, 2004 - * Time: 7:12:47 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public class BreakException extends EvaluateException{ private final String myLabelName; diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/CodeFragmentEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/CodeFragmentEvaluator.java index 9597b31ee08b..5fb1e8b2823a 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/CodeFragmentEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/CodeFragmentEvaluator.java @@ -15,10 +15,10 @@ */ package com.intellij.debugger.engine.evaluation.expression; +import com.intellij.debugger.DebuggerBundle; import com.intellij.debugger.engine.evaluation.EvaluateException; import com.intellij.debugger.engine.evaluation.EvaluateExceptionUtil; import com.intellij.debugger.jdi.VirtualMachineProxyImpl; -import com.intellij.debugger.DebuggerBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.util.containers.HashMap; import com.sun.jdi.Value; @@ -26,11 +26,7 @@ import com.sun.jdi.Value; import java.util.Map; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Mar 24, 2004 - * Time: 10:45:50 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public class CodeFragmentEvaluator extends BlockStatementEvaluator{ private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.CodeFragmentEvaluator"); diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/ContinueException.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/ContinueException.java index 80caa8d746dc..fd0dff311816 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/ContinueException.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/ContinueException.java @@ -15,15 +15,11 @@ */ package com.intellij.debugger.engine.evaluation.expression; -import com.intellij.debugger.engine.evaluation.EvaluateException; import com.intellij.debugger.DebuggerBundle; +import com.intellij.debugger.engine.evaluation.EvaluateException; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 20, 2004 - * Time: 7:12:47 PM - * To change this template use File | Settings | File Templates. + * @authorlex */ public class ContinueException extends EvaluateException{ private final String myLabelName; diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/ForStatementEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/ForStatementEvaluator.java index e97072509714..be074474777b 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/ForStatementEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/ForStatementEvaluator.java @@ -22,11 +22,7 @@ import com.intellij.openapi.util.Comparing; import com.sun.jdi.BooleanValue; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 20, 2004 - * Time: 5:03:47 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public class ForStatementEvaluator implements Evaluator { private final Evaluator myInitializationEvaluator; @@ -35,9 +31,13 @@ public class ForStatementEvaluator implements Evaluator { private final Evaluator myBodyEvaluator; private Modifier myModifier; - private final String myLabelName; + private final String myLabelName; - public ForStatementEvaluator(Evaluator initializationEvaluator, Evaluator conditionEvaluator, Evaluator updateEvaluator, Evaluator bodyEvaluator, String labelName) { + public ForStatementEvaluator(Evaluator initializationEvaluator, + Evaluator conditionEvaluator, + Evaluator updateEvaluator, + Evaluator bodyEvaluator, + String labelName) { myInitializationEvaluator = initializationEvaluator; myConditionEvaluator = conditionEvaluator; myUpdateEvaluator = updateEvaluator; @@ -51,19 +51,20 @@ public class ForStatementEvaluator implements Evaluator { public Object evaluate(EvaluationContextImpl context) throws EvaluateException { Object value = context.getDebugProcess().getVirtualMachineProxy().mirrorOf(); - if(myInitializationEvaluator != null) { + if (myInitializationEvaluator != null) { value = myInitializationEvaluator.evaluate(context); myModifier = myInitializationEvaluator.getModifier(); } - for (;;) { - if(myConditionEvaluator != null) { + while (true) { + if (myConditionEvaluator != null) { value = myConditionEvaluator.evaluate(context); myModifier = myConditionEvaluator.getModifier(); - if(!(value instanceof BooleanValue)) { + if (!(value instanceof BooleanValue)) { throw EvaluateExceptionUtil.BOOLEAN_EXPECTED; - } else { - if(!((BooleanValue)value).booleanValue()) { + } + else { + if (!((BooleanValue)value).booleanValue()) { break; } } @@ -73,19 +74,23 @@ public class ForStatementEvaluator implements Evaluator { myBodyEvaluator.evaluate(context); } catch (BreakException e) { - if(Comparing.equal(e.getLabelName(), myLabelName)) { + if (Comparing.equal(e.getLabelName(), myLabelName)) { break; - } else + } + else { throw e; + } } catch (ContinueException e) { - if(Comparing.equal(e.getLabelName(), myLabelName)) { + if (Comparing.equal(e.getLabelName(), myLabelName)) { //continue; - } else + } + else { throw e; + } } - if(myUpdateEvaluator != null) { + if (myUpdateEvaluator != null) { value = myUpdateEvaluator.evaluate(context); myModifier = myUpdateEvaluator.getModifier(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/IfStatementEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/IfStatementEvaluator.java index 8a73bf6c1c34..a13cdd432e1c 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/IfStatementEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/IfStatementEvaluator.java @@ -15,18 +15,13 @@ */ package com.intellij.debugger.engine.evaluation.expression; -import com.intellij.debugger.engine.evaluation.EvaluationContextImpl; +import com.intellij.debugger.engine.evaluation.EvaluateException; import com.intellij.debugger.engine.evaluation.EvaluateExceptionUtil; -import com.intellij.debugger.engine.evaluation.EvaluateException; -import com.intellij.debugger.engine.evaluation.EvaluateException; +import com.intellij.debugger.engine.evaluation.EvaluationContextImpl; import com.sun.jdi.BooleanValue; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 20, 2004 - * Time: 5:03:47 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public class IfStatementEvaluator implements Evaluator { private final Evaluator myConditionEvaluator; diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/MapStack.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/MapStack.java deleted file mode 100644 index 4e35e79dd24e..000000000000 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/MapStack.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.debugger.engine.evaluation.expression; - -import com.intellij.openapi.diagnostic.Logger; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; - -/** - * Created by IntelliJ IDEA. - * User: lex - * Date: Mar 24, 2004 - * Time: 10:36:12 PM - * To change this template use File | Settings | File Templates. - */ -public class MapStack { - private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.MapStack"); - - private final LinkedList> myStack; - - public MapStack() { - myStack = new LinkedList>(); - push(); - } - - public void push(){ - myStack.addFirst(new HashMap()); - } - - public void pop(){ - myStack.removeFirst(); - LOG.assertTrue(myStack.size() > 0); - } - - private HashMap current() { - return myStack.getFirst(); - } - - public void put(Key key, Value value) { - current().put(key, value); - } - - public boolean containsKey(Key key){ - for (Iterator> iterator = myStack.iterator(); iterator.hasNext();) { - HashMap hashMap = iterator.next(); - if(hashMap.containsKey(key))return true; - } - return false; - } - - public Value get(Key key) { - for (Iterator> iterator = myStack.iterator(); iterator.hasNext();) { - HashMap hashMap = iterator.next(); - Value value = hashMap.get(key); - if(value != null) return value; - } - return null; - } -} diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/PostfixOperationEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/PostfixOperationEvaluator.java index f5e0fa3d2304..e4ee8c5a0d3e 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/PostfixOperationEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/PostfixOperationEvaluator.java @@ -23,11 +23,7 @@ import com.sun.jdi.Value; import org.jetbrains.annotations.NonNls; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 20, 2004 - * Time: 5:34:50 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public class PostfixOperationEvaluator implements Evaluator{ private final Evaluator myOperandEvaluator; diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/SyntheticVariableEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/SyntheticVariableEvaluator.java index 23bd6df7555e..e96884cd0398 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/SyntheticVariableEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/SyntheticVariableEvaluator.java @@ -18,18 +18,13 @@ package com.intellij.debugger.engine.evaluation.expression; import com.intellij.debugger.engine.evaluation.EvaluateException; import com.intellij.debugger.engine.evaluation.EvaluationContextImpl; import com.intellij.debugger.ui.impl.watch.NodeDescriptorImpl; -import com.intellij.debugger.ui.impl.watch.NodeManagerImpl; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.sun.jdi.Type; import com.sun.jdi.Value; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Mar 25, 2004 - * Time: 2:53:29 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public class SyntheticVariableEvaluator implements Evaluator{ private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.SyntheticVariableEvaluator"); diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/WhileStatementEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/WhileStatementEvaluator.java index a9bc631f79e6..73a143ce1148 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/WhileStatementEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/WhileStatementEvaluator.java @@ -22,11 +22,7 @@ import com.intellij.openapi.util.Comparing; import com.sun.jdi.BooleanValue; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 20, 2004 - * Time: 5:03:47 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public class WhileStatementEvaluator implements Evaluator { private final Evaluator myConditionEvaluator; @@ -45,12 +41,13 @@ public class WhileStatementEvaluator implements Evaluator { public Object evaluate(EvaluationContextImpl context) throws EvaluateException { Object value; - for (;;) { + while (true) { value = myConditionEvaluator.evaluate(context); - if(!(value instanceof BooleanValue)) { + if (!(value instanceof BooleanValue)) { throw EvaluateExceptionUtil.BOOLEAN_EXPECTED; - } else { - if(!((BooleanValue)value).booleanValue()) { + } + else { + if (!((BooleanValue)value).booleanValue()) { break; } } @@ -58,16 +55,17 @@ public class WhileStatementEvaluator implements Evaluator { myBodyEvaluator.evaluate(context); } catch (BreakException e) { - if(Comparing.equal(e.getLabelName(), myLabelName)) { + if (Comparing.equal(e.getLabelName(), myLabelName)) { break; - } else + } + else { throw e; + } } catch (ContinueException e) { - if(Comparing.equal(e.getLabelName(), myLabelName)) { - continue; - } else + if (!Comparing.equal(e.getLabelName(), myLabelName)) { throw e; + } } } diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/events/DebuggerCommandImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/events/DebuggerCommandImpl.java index d0ce0c115b67..038ff6db1b2a 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/events/DebuggerCommandImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/events/DebuggerCommandImpl.java @@ -18,11 +18,7 @@ package com.intellij.debugger.engine.events; import com.intellij.debugger.impl.DebuggerTaskImpl; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Mar 5, 2004 - * Time: 6:04:07 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public abstract class DebuggerCommandImpl extends DebuggerTaskImpl { protected abstract void action() throws Exception; diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/CloseWorkerThreadException.java b/java/debugger/impl/src/com/intellij/debugger/impl/CloseWorkerThreadException.java deleted file mode 100644 index 31e956f7cbc0..000000000000 --- a/java/debugger/impl/src/com/intellij/debugger/impl/CloseWorkerThreadException.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.debugger.impl; - -/** - * Created by IntelliJ IDEA. - * User: lex - * Date: Mar 31, 2004 - * Time: 4:58:01 PM - * To change this template use File | Settings | File Templates. - */ -public class CloseWorkerThreadException extends RuntimeException { -} diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerTask.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerTask.java index 6467c4373f55..81639f2003c5 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerTask.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerTask.java @@ -16,14 +16,12 @@ package com.intellij.debugger.impl; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 7, 2004 - * Time: 2:40:47 PM - * To change this template use File | Settings | File Templates. + * @author lex */ -public interface DebuggerTask extends PrioritizedTask{ +public interface DebuggerTask extends PrioritizedTask { void release(); + void hold(); + void waitFor(); } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerTaskImpl.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerTaskImpl.java index 7a0efd894d07..03cda8d8e839 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerTaskImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerTaskImpl.java @@ -16,11 +16,7 @@ package com.intellij.debugger.impl; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Feb 27, 2004 - * Time: 12:56:52 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public abstract class DebuggerTaskImpl implements DebuggerTask { private boolean myOnHold = false; diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/EventQueueClosedException.java b/java/debugger/impl/src/com/intellij/debugger/impl/EventQueueClosedException.java index 6410b7ee49db..be0cd485b30b 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/EventQueueClosedException.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/EventQueueClosedException.java @@ -16,11 +16,7 @@ package com.intellij.debugger.impl; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Feb 19, 2004 - * Time: 8:48:37 PM - * To change this template use File | Settings | File Templates. + * @author lex */ -public class EventQueueClosedException extends Exception{ +public class EventQueueClosedException extends Exception { } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/InvokeAndWaitThread.java b/java/debugger/impl/src/com/intellij/debugger/impl/InvokeAndWaitThread.java index d88a62adb425..3278e59f1764 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/InvokeAndWaitThread.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/InvokeAndWaitThread.java @@ -15,23 +15,19 @@ */ package com.intellij.debugger.impl; - - /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Feb 24, 2004 - * Time: 3:27:55 PM - * To change this template use File | Settings | File Templates. + * @author lex */ -public abstract class InvokeAndWaitThread extends InvokeThread{ +public abstract class InvokeAndWaitThread extends InvokeThread { public InvokeAndWaitThread() { super(); } - //Do not remove this code - //Otherwise it will be impossible to override schedule method + /** + * !!! Do not remove this code !!! + * Otherwise it will be impossible to override schedule method + */ public void schedule(E e) { super.schedule(e); } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/InvokeThread.java b/java/debugger/impl/src/com/intellij/debugger/impl/InvokeThread.java index d17f14a45e76..b041959ed403 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/InvokeThread.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/InvokeThread.java @@ -22,11 +22,7 @@ import com.sun.jdi.VMDisconnectedException; import java.util.concurrent.*; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Mar 19, 2004 - * Time: 11:42:03 AM - * To change this template use File | Settings | File Templates. + * @author lex */ public abstract class InvokeThread { private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.InvokeThread"); @@ -47,7 +43,7 @@ public abstract class InvokeThread { try { wait(); } - catch (InterruptedException e) { + catch (InterruptedException ignore) { } } } diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/ReloadClassesWorker.java b/java/debugger/impl/src/com/intellij/debugger/impl/ReloadClassesWorker.java index 350fc81ebc30..7145ea99a359 100644 --- a/java/debugger/impl/src/com/intellij/debugger/impl/ReloadClassesWorker.java +++ b/java/debugger/impl/src/com/intellij/debugger/impl/ReloadClassesWorker.java @@ -33,15 +33,12 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.io.IOException; +import java.util.HashMap; import java.util.List; import java.util.Map; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Mar 10, 2004 - * Time: 7:12:57 PM - * To change this template use File | Settings | File Templates. + * @author lex */ class ReloadClassesWorker { private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.impl.ReloadClassesWorker"); @@ -62,10 +59,6 @@ class ReloadClassesWorker { return myDebuggerSession.getProcess(); } - private Project getProject() { - return myDebuggerSession.getProject(); - } - private void processException(Throwable e) { if (e.getMessage() != null) { myProgress.addMessage(myDebuggerSession, MessageCategory.ERROR, e.getMessage()); @@ -120,7 +113,7 @@ class ReloadClassesWorker { virtualMachineProxy.suspend(); try { - final Map redefineMap = new java.util.HashMap(); + final Map redefineMap = new HashMap(); int processedClassesCount = 0; final IOException[] _ex = new IOException[] {null}; for (final String qualifiedName : modifiedClasses.keySet()) { diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/CompletedInputTextField.java b/java/debugger/impl/src/com/intellij/debugger/ui/CompletedInputTextField.java deleted file mode 100644 index 587c19275a3d..000000000000 --- a/java/debugger/impl/src/com/intellij/debugger/ui/CompletedInputTextField.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.intellij.debugger.ui; - -/** - * Created by IntelliJ IDEA. - * User: lex - * Date: Mar 31, 2004 - * Time: 7:48:44 PM - * To change this template use File | Settings | File Templates. - */ -public interface CompletedInputTextField { -} diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerEditorImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerEditorImpl.java index ca8cb5167e5d..a5329014a881 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerEditorImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerEditorImpl.java @@ -34,11 +34,7 @@ import java.util.ArrayList; import java.util.List; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 12, 2004 - * Time: 2:46:02 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public abstract class DebuggerEditorImpl extends CompletionEditor{ private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.DebuggerEditorImpl"); @@ -86,7 +82,9 @@ public abstract class DebuggerEditorImpl extends CompletionEditor{ if (document != null) { PsiDocumentManager.getInstance(project).commitDocument(document); PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document); - return createText(psiFile.getText(), ((JavaCodeFragment)psiFile).importsToString()); + if (psiFile != null) { + return createText(psiFile.getText(), ((JavaCodeFragment)psiFile).importsToString()); + } } return createText(""); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java index 54f25204b1a9..4b5d2c73cd27 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerStatementEditor.java @@ -37,11 +37,7 @@ import java.util.List; import java.util.ListIterator; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 12, 2004 - * Time: 2:39:17 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public class DebuggerStatementEditor extends DebuggerEditorImpl { private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.DebuggerStatementEditor"); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/StatementEvaluationDialog.java b/java/debugger/impl/src/com/intellij/debugger/ui/StatementEvaluationDialog.java index fe35ba2a7306..f90764a55b30 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/StatementEvaluationDialog.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/StatementEvaluationDialog.java @@ -46,11 +46,7 @@ import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 12, 2004 - * Time: 4:28:52 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public class StatementEvaluationDialog extends EvaluationDialog{ private final JPanel myPanel; @@ -79,7 +75,7 @@ public class StatementEvaluationDialog extends EvaluationDialog{ splitter.setFirstComponent(editorPanel); - final EvaluationDialog.MyEvaluationPanel evaluationPanel = getEvaluationPanel(); + final MyEvaluationPanel evaluationPanel = getEvaluationPanel(); final JPanel ep = new JPanel(new BorderLayout()); final JLabel resultLabel = new JLabel(DebuggerBundle.message("label.evaluate.dialog.result")); ep.add(resultLabel, BorderLayout.NORTH); @@ -166,6 +162,9 @@ public class StatementEvaluationDialog extends EvaluationDialog{ private void updateSwitchButton(Document document) { PsiDocumentManager.getInstance(getProject()).commitDocument(document); PsiFile psiFile = PsiDocumentManager.getInstance(getProject()).getPsiFile(document); + if (psiFile == null) { + return; + } PsiElement[] children = psiFile.getChildren(); int nonWhite = 0; for (PsiElement child : children) { @@ -215,7 +214,7 @@ public class StatementEvaluationDialog extends EvaluationDialog{ private class SwitchAction extends AbstractAction { public SwitchAction() { - putValue(Action.NAME, DebuggerBundle.message("action.evaluate.statement.dialog.switch.mode.description")); + putValue(NAME, DebuggerBundle.message("action.evaluate.statement.dialog.switch.mode.description")); } public void actionPerformed(ActionEvent e) { diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/TipManager.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/TipManager.java index fec8ee4b2583..721d287833db 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/TipManager.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/TipManager.java @@ -38,11 +38,7 @@ import java.awt.*; import java.awt.event.*; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Jan 29, 2004 - * Time: 4:23:11 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public class TipManager implements Disposable, PopupMenuListener { @@ -53,7 +49,7 @@ public class TipManager implements Disposable, PopupMenuListener { private MouseEvent myLastMouseEvent; - public static interface TipFactory { + public interface TipFactory { JComponent createToolTip (MouseEvent e); MouseEvent createTooltipEvent(MouseEvent candiateEvent); boolean isFocusOwner(); @@ -152,8 +148,8 @@ public class TipManager implements Disposable, PopupMenuListener { private boolean isInsideComponent(final MouseEvent e) { final Rectangle compBounds = myComponent.getBounds(); final Point compPoint = SwingUtilities.convertPoint(e.getComponent(), e.getPoint(), myComponent); - final boolean insideCoponent = compBounds.contains(compPoint); - return insideCoponent; + + return compBounds.contains(compPoint); } diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/EvaluationDescriptor.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/EvaluationDescriptor.java index 20905ce4a113..da78e13ce48e 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/EvaluationDescriptor.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/EvaluationDescriptor.java @@ -42,11 +42,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 12, 2004 - * Time: 5:24:17 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public abstract class EvaluationDescriptor extends ValueDescriptorImpl{ private Modifier myModifier; diff --git a/java/debugger/openapi/src/com/intellij/debugger/DebuggerManager.java b/java/debugger/openapi/src/com/intellij/debugger/DebuggerManager.java index 3ee119ab1f7a..c0f0bfede608 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/DebuggerManager.java +++ b/java/debugger/openapi/src/com/intellij/debugger/DebuggerManager.java @@ -25,30 +25,29 @@ import com.intellij.psi.PsiClass; import com.intellij.util.Function; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 29, 2004 - * Time: 6:33:26 PM - * To change this template use File | Settings | File Templates. + * @author lex */ -public abstract class DebuggerManager implements ProjectComponent, JDOMExternalizable{ +public abstract class DebuggerManager implements ProjectComponent, JDOMExternalizable { public static DebuggerManager getInstance(Project project) { return project.getComponent(DebuggerManager.class); } public abstract DebugProcess getDebugProcess(ProcessHandler processHandler); - public abstract void addDebugProcessListener (ProcessHandler processHandler, DebugProcessListener listener); + public abstract void addDebugProcessListener(ProcessHandler processHandler, DebugProcessListener listener); + public abstract void removeDebugProcessListener(ProcessHandler processHandler, DebugProcessListener listener); public abstract boolean isDebuggerManagerThread(); - + public abstract void addClassNameMapper(NameMapper mapper); + public abstract void removeClassNameMapper(NameMapper mapper); - - public abstract String getVMClassQualifiedName(PsiClass aClass); - - public abstract void registerPositionManagerFactory(Function factory); + + public abstract String getVMClassQualifiedName(PsiClass aClass); + + public abstract void registerPositionManagerFactory(Function factory); + public abstract void unregisterPositionManagerFactory(Function factory); - + } diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcess.java b/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcess.java index 7d15ce9c419a..bca8159ee988 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcess.java +++ b/java/debugger/openapi/src/com/intellij/debugger/engine/DebugProcess.java @@ -32,11 +32,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 2, 2004 - * Time: 7:17:18 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public interface DebugProcess { @NonNls String JAVA_STRATUM = "Java"; diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateExceptionUtil.java b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateExceptionUtil.java index ad3a6590e408..dff6dc30575b 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateExceptionUtil.java +++ b/java/debugger/openapi/src/com/intellij/debugger/engine/evaluation/EvaluateExceptionUtil.java @@ -19,11 +19,7 @@ import com.intellij.debugger.DebuggerBundle; import com.sun.jdi.*; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 8, 2004 - * Time: 4:38:36 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public class EvaluateExceptionUtil { public static final EvaluateException INCONSISTEND_DEBUG_INFO = createEvaluateException(DebuggerBundle.message("evaluation.error.inconsistent.debug.info")); @@ -38,6 +34,9 @@ public class EvaluateExceptionUtil { public static final EvaluateException THREAD_WAS_RESUMED = createEvaluateException(DebuggerBundle.message("evaluation.error.thread.resumed")); public static final EvaluateException DEBUG_INFO_UNAVAILABLE = createEvaluateException(DebuggerBundle.message("evaluation.error.debug.info.unavailable")); + private EvaluateExceptionUtil() { + } + public static EvaluateException createEvaluateException(Throwable th) { return createEvaluateException(null, th); } diff --git a/java/debugger/openapi/src/com/intellij/debugger/engine/jdi/VirtualMachineProxy.java b/java/debugger/openapi/src/com/intellij/debugger/engine/jdi/VirtualMachineProxy.java index 04031f70dc20..4f4cb8243652 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/engine/jdi/VirtualMachineProxy.java +++ b/java/debugger/openapi/src/com/intellij/debugger/engine/jdi/VirtualMachineProxy.java @@ -21,11 +21,7 @@ import com.sun.jdi.ReferenceType; import java.util.List; /** - * Created by IntelliJ IDEA. - * User: lex - * Date: Apr 2, 2004 - * Time: 8:49:42 PM - * To change this template use File | Settings | File Templates. + * @author lex */ public interface VirtualMachineProxy { List allClasses(); diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfo.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfo.java index e425e7040821..457ef1fc6c33 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfo.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypeInfo.java @@ -20,11 +20,7 @@ import com.intellij.psi.PsiType; import org.jetbrains.annotations.NotNull; /** - * Created by IntelliJ IDEA. - * User: ven - * Date: Jul 14, 2004 - * Time: 4:45:46 PM - * To change this template use File | Settings | File Templates. + * @author ven */ public interface ExpectedTypeInfo { int TYPE_STRICTLY = 0; @@ -35,19 +31,19 @@ public interface ExpectedTypeInfo { PsiMethod getCalledMethod(); @NotNull - PsiType getType (); + PsiType getType(); - PsiType getDefaultType (); + PsiType getDefaultType(); int getKind(); - boolean equals (ExpectedTypeInfo info); + boolean equals(ExpectedTypeInfo info); String toString(); ExpectedTypeInfo[] intersect(ExpectedTypeInfo info); - boolean isArrayTypeInfo (); + boolean isArrayTypeInfo(); TailType getTailType(); diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingForeachBodyFixer.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingForeachBodyFixer.java index 5ca384ec26a4..807043331c77 100644 --- a/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingForeachBodyFixer.java +++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/smartEnter/MissingForeachBodyFixer.java @@ -15,18 +15,14 @@ */ package com.intellij.codeInsight.editorActions.smartEnter; -import com.intellij.psi.*; -import com.intellij.psi.util.PsiTreeUtil; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; +import com.intellij.psi.*; +import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Jul 5, 2004 - * Time: 8:44:32 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public class MissingForeachBodyFixer implements Fixer { public void apply(Editor editor, JavaSmartEnterProcessor processor, PsiElement psiElement) throws IncorrectOperationException { diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/AnnotationParameterInfoHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/AnnotationParameterInfoHandler.java index 7ff5fe9cb4ac..bbd0c485137d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/AnnotationParameterInfoHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/AnnotationParameterInfoHandler.java @@ -15,20 +15,16 @@ */ package com.intellij.codeInsight.hint.api.impls; +import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.lang.parameterInfo.*; import com.intellij.psi.*; import com.intellij.util.text.CharArrayUtil; -import com.intellij.codeInsight.lookup.LookupElement; import org.jetbrains.annotations.NonNls; -import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Feb 1, 2006 - * Time: 3:16:16 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public class AnnotationParameterInfoHandler implements ParameterInfoHandler { public @Nullable Object[] getParametersForLookup(LookupElement item, ParameterInfoContext context) { diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/ReferenceParameterInfoHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/ReferenceParameterInfoHandler.java index 6df6a9bc418d..301d74869396 100644 --- a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/ReferenceParameterInfoHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/ReferenceParameterInfoHandler.java @@ -15,22 +15,18 @@ */ package com.intellij.codeInsight.hint.api.impls; +import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.lang.parameterInfo.*; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.util.Function; -import com.intellij.codeInsight.lookup.LookupElement; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import java.util.Arrays; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Feb 1, 2006 - * Time: 3:16:09 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public class ReferenceParameterInfoHandler implements ParameterInfoHandler { public Object[] getParametersForLookup(final LookupElement item, final ParameterInfoContext context) { diff --git a/java/java-impl/src/com/intellij/codeInsight/template/impl/TextExpression.java b/java/java-impl/src/com/intellij/codeInsight/template/impl/TextExpression.java index 982c3a680d11..78055b3dc7a8 100644 --- a/java/java-impl/src/com/intellij/codeInsight/template/impl/TextExpression.java +++ b/java/java-impl/src/com/intellij/codeInsight/template/impl/TextExpression.java @@ -22,11 +22,7 @@ import com.intellij.codeInsight.template.Result; import com.intellij.codeInsight.template.TextResult; /** - * Created by IntelliJ IDEA. - * User: Maxim - * Date: Nov 7, 2006 - * Time: 12:17:39 AM - * To change this template use File | Settings | File Templates. + * @author Maxim */ public class TextExpression extends Expression { private final String myString; diff --git a/java/java-impl/src/com/intellij/javadoc/JavadocBundle.java b/java/java-impl/src/com/intellij/javadoc/JavadocBundle.java index 3e4c0a155ece..b59c698e5954 100644 --- a/java/java-impl/src/com/intellij/javadoc/JavadocBundle.java +++ b/java/java-impl/src/com/intellij/javadoc/JavadocBundle.java @@ -24,11 +24,7 @@ import java.lang.ref.SoftReference; import java.util.ResourceBundle; /** - * Created by IntelliJ IDEA. - * User: yole - * Date: 01.09.2005 - * Time: 14:37:13 - * To change this template use File | Settings | File Templates. + * @author yole */ public class JavadocBundle { private static Reference ourBundle; @@ -38,7 +34,7 @@ public class JavadocBundle { private JavadocBundle() { } - public static String message(@PropertyKey(resourceBundle = BUNDLE)String key, Object... params) { + public static String message(@PropertyKey(resourceBundle = BUNDLE) String key, Object... params) { return CommonBundle.message(getBundle(), key, params); } diff --git a/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java b/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java index 26745d57a7bb..a9656cdafa26 100644 --- a/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java +++ b/java/java-impl/src/com/intellij/lang/java/JavaDocumentationProvider.java @@ -61,11 +61,7 @@ import org.jetbrains.annotations.Nullable; import java.util.*; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Apr 11, 2006 - * Time: 7:45:12 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public class JavaDocumentationProvider implements CodeDocumentationProvider { private static final String LINE_SEPARATOR = "\n"; @@ -608,7 +604,7 @@ public class JavaDocumentationProvider implements CodeDocumentationProvider { return CodeInsightBundle.message("javadoc.candidates.not.found", text); } - private void createElementLink(@NonNls final StringBuffer sb, final PsiElement element, final String str) { + private static void createElementLink(@NonNls final StringBuffer sb, final PsiElement element, final String str) { sb.append("  "); @@ -649,7 +645,7 @@ public class JavaDocumentationProvider implements CodeDocumentationProvider { JBPopupFactory.getInstance().createListPopup(new BaseListPopupStep("Choose javadoc root", ArrayUtil.toStringArray(set)) { public PopupStep onChosen(final String selectedValue, final boolean finalChoice) { BrowserUtil.launchBrowser(selectedValue); - return PopupStep.FINAL_CHOICE; + return FINAL_CHOICE; } }).showInBestPositionFor(DataManager.getInstance().getDataContext()); } diff --git a/java/java-impl/src/com/intellij/lang/java/JavaLanguage.java b/java/java-impl/src/com/intellij/lang/java/JavaLanguage.java index 1e05e1d4f774..5282be171fe4 100644 --- a/java/java-impl/src/com/intellij/lang/java/JavaLanguage.java +++ b/java/java-impl/src/com/intellij/lang/java/JavaLanguage.java @@ -26,11 +26,7 @@ import com.intellij.pom.java.LanguageLevel; import org.jetbrains.annotations.NotNull; /** - * Created by IntelliJ IDEA. - * User: max - * Date: Jan 22, 2005 - * Time: 11:16:59 PM - * To change this template use File | Settings | File Templates. + * @author max */ public class JavaLanguage extends Language { public JavaLanguage() { @@ -38,7 +34,8 @@ public class JavaLanguage extends Language { SyntaxHighlighterFactory.LANGUAGE_FACTORY.addExplicitExtension(this, new SyntaxHighlighterFactory() { @NotNull public SyntaxHighlighter getSyntaxHighlighter(final Project project, final VirtualFile virtualFile) { - return new JavaFileHighlighter(virtualFile != null ? LanguageLevelUtil.getLanguageLevelForFile(virtualFile) : LanguageLevel.HIGHEST); + return new JavaFileHighlighter( + virtualFile != null ? LanguageLevelUtil.getLanguageLevelForFile(virtualFile) : LanguageLevel.HIGHEST); } }); } diff --git a/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java b/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java index 17558301ca28..c69bef5561b5 100644 --- a/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java +++ b/java/java-impl/src/com/intellij/lang/java/JavaParserDefinition.java @@ -35,11 +35,7 @@ import com.intellij.psi.util.PsiUtil; import org.jetbrains.annotations.NotNull; /** - * Created by IntelliJ IDEA. - * User: max - * Date: Jan 26, 2005 - * Time: 12:40:22 PM - * To change this template use File | Settings | File Templates. + * @author max */ public class JavaParserDefinition implements ParserDefinition { private final TokenSet myStringLiteralElementSet = TokenSet.create(JavaElementType.LITERAL_EXPRESSION); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportsFormatter.java b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportsFormatter.java index f60e452428f1..35531343cec7 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportsFormatter.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/codeStyle/ImportsFormatter.java @@ -30,13 +30,8 @@ import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.NonNls; /** - * Created by IntelliJ IDEA. - * User: lesya - * Date: Jul 21, 2005 - * Time: 7:42:23 PM - * To change this template use File | Settings | File Templates. + * @author lesya */ - public class ImportsFormatter extends XmlRecursiveElementVisitor { private static final Logger LOG = Logger.getInstance("#com.intellij.psi.impl.source.codeStyle.ImportsFormatter"); @@ -59,7 +54,7 @@ public class ImportsFormatter extends XmlRecursiveElementVisitor { } } - private boolean isPageDirectiveTag(final XmlTag tag) { + private static boolean isPageDirectiveTag(final XmlTag tag) { return PAGE_DIRECTIVE.equals(tag.getName()); } @@ -134,7 +129,7 @@ public class ImportsFormatter extends XmlRecursiveElementVisitor { } } - private ASTNode findValueToken(final ASTNode node) { + private static ASTNode findValueToken(final ASTNode node) { ASTNode child = node.getFirstChildNode(); while (child != null){ if (child.getElementType() == XmlElementType.XML_ATTRIBUTE_VALUE_TOKEN) return child; @@ -143,7 +138,7 @@ public class ImportsFormatter extends XmlRecursiveElementVisitor { return null; } - private boolean isImportAttribute(final XmlAttribute attribute) { + private static boolean isImportAttribute(final XmlAttribute attribute) { return IMPORT_ATT.equals(attribute.getName()); } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/ValueDocTagInfo.java b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/ValueDocTagInfo.java index 595ef8c5b9d6..d8932ff1783c 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/ValueDocTagInfo.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/ValueDocTagInfo.java @@ -20,17 +20,13 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiField; import com.intellij.psi.PsiModifier; import com.intellij.psi.PsiReference; -import com.intellij.psi.util.PsiUtil; import com.intellij.psi.impl.JavaConstantExpressionEvaluator; import com.intellij.psi.javadoc.JavadocTagInfo; import com.intellij.psi.javadoc.PsiDocTagValue; +import com.intellij.psi.util.PsiUtil; /** - * Created by IntelliJ IDEA. - * User: yole - * Date: 10.08.2005 - * Time: 18:25:51 - * To change this template use File | Settings | File Templates. + * @author yole */ public class ValueDocTagInfo implements JavadocTagInfo { public String getName() { @@ -81,6 +77,6 @@ public class ValueDocTagInfo implements JavadocTagInfo { } public PsiReference getReference(PsiDocTagValue value) { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } } diff --git a/java/java-impl/src/com/intellij/psi/impl/source/parsing/JavaParsingContext.java b/java/java-impl/src/com/intellij/psi/impl/source/parsing/JavaParsingContext.java index 856f0c4dfe28..e1cec1c88e36 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/parsing/JavaParsingContext.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/parsing/JavaParsingContext.java @@ -15,16 +15,12 @@ */ package com.intellij.psi.impl.source.parsing; +import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.impl.source.ParsingContext; import com.intellij.util.CharTable; -import com.intellij.pom.java.LanguageLevel; /** - * Created by IntelliJ IDEA. - * User: ik - * Date: 07.06.2004 - * Time: 18:45:17 - * To change this template use File | Settings | File Templates. + * @author ik */ public class JavaParsingContext extends ParsingContext { private final DeclarationParsing myDeclarationParsing; diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/PsiExtendedTypeVisitor.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/PsiExtendedTypeVisitor.java index e9f7f4d77a71..264face31401 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/PsiExtendedTypeVisitor.java +++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/PsiExtendedTypeVisitor.java @@ -20,13 +20,9 @@ import com.intellij.psi.PsiType; import com.intellij.psi.PsiTypeVisitorEx; /** - * Created by IntelliJ IDEA. - * User: db - * Date: Dec 27, 2004 - * Time: 7:20:09 PM - * To change this template use File | Settings | File Templates. + * @author db */ -public abstract class PsiExtendedTypeVisitor extends PsiTypeVisitorEx { +public abstract class PsiExtendedTypeVisitor extends PsiTypeVisitorEx { public X visitClassType(final PsiClassType classType) { super.visitClassType(classType); final PsiClassType.ClassResolveResult result = classType.resolveGenerics(); diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/PsiTypeVariableFactory.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/PsiTypeVariableFactory.java index 0a3b33895584..35c5d72b3083 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/PsiTypeVariableFactory.java +++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/PsiTypeVariableFactory.java @@ -23,15 +23,10 @@ import org.jetbrains.annotations.NotNull; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedList; /** - * Created by IntelliJ IDEA. - * User: db - * Date: Jan 12, 2005 - * Time: 9:41:45 PM - * To change this template use File | Settings | File Templates. + * @author db */ public class PsiTypeVariableFactory { private int myCurrent = 0; @@ -45,8 +40,8 @@ public class PsiTypeVariableFactory { public final void registerCluster(final HashSet cluster) { myClusters.add(cluster); - for (final Iterator v = cluster.iterator(); v.hasNext();) { - myVarCluster.put(new Integer(v.next().getIndex()), cluster); + for (final PsiTypeVariable aCluster : cluster) { + myVarCluster.put(new Integer(aCluster.getIndex()), cluster); } } @@ -77,76 +72,75 @@ public class PsiTypeVariableFactory { } return type.accept(new PsiTypeVisitor() { - public Boolean visitType(final PsiType type) { - return Boolean.TRUE; - } + public Boolean visitType(final PsiType type) { + return Boolean.TRUE; + } - public Boolean visitArrayType(final PsiArrayType arrayType) { - return arrayType.getDeepComponentType().accept(this); - } + public Boolean visitArrayType(final PsiArrayType arrayType) { + return arrayType.getDeepComponentType().accept(this); + } - public Boolean visitWildcardType(final PsiWildcardType wildcardType) { - final PsiType bound = wildcardType.getBound(); + public Boolean visitWildcardType(final PsiWildcardType wildcardType) { + final PsiType bound = wildcardType.getBound(); - if (bound != null) { - bound.accept(this); - } + if (bound != null) { + bound.accept(this); + } - return Boolean.TRUE; - } + return Boolean.TRUE; + } - public Boolean visitClassType(final PsiClassType classType) { - final PsiClassType.ClassResolveResult result = classType.resolveGenerics(); - final PsiClass aClass = result.getElement(); - final PsiSubstitutor aSubst = result.getSubstitutor(); + public Boolean visitClassType(final PsiClassType classType) { + final PsiClassType.ClassResolveResult result = classType.resolveGenerics(); + final PsiClass aClass = result.getElement(); + final PsiSubstitutor aSubst = result.getSubstitutor(); - if (aClass != null) { - final PsiManager manager = aClass.getManager(); - final JavaPsiFacade facade = JavaPsiFacade.getInstance(manager.getProject()); + if (aClass != null) { + final PsiManager manager = aClass.getManager(); + final JavaPsiFacade facade = JavaPsiFacade.getInstance(manager.getProject()); - if (aClass instanceof PsiTypeParameter) { - final PsiTypeParameterListOwner owner = - PsiTreeUtil.getParentOfType(myContext, PsiTypeParameterListOwner.class); + if (aClass instanceof PsiTypeParameter) { + final PsiTypeParameterListOwner owner = PsiTreeUtil.getParentOfType(myContext, PsiTypeParameterListOwner.class); - if (owner != null) { - boolean found = false; + if (owner != null) { + boolean found = false; - for (PsiTypeParameter typeParameter : PsiUtil.typeParametersIterable(owner)) { - found = manager.areElementsEquivalent(typeParameter, aClass); - if (found) break; - } + for (PsiTypeParameter typeParameter : PsiUtil.typeParametersIterable(owner)) { + found = manager.areElementsEquivalent(typeParameter, aClass); + if (found) break; + } - if (!found) { - return Boolean.FALSE; - } - } - else { - return Boolean.FALSE; - } - } - else if (!facade.getResolveHelper().isAccessible(aClass, myContext, null)) { - return Boolean.FALSE; - } + if (!found) { + return Boolean.FALSE; + } + } + else { + return Boolean.FALSE; + } + } + else if (!facade.getResolveHelper().isAccessible(aClass, myContext, null)) { + return Boolean.FALSE; + } - for (PsiTypeParameter parm : PsiUtil.typeParametersIterable(aClass)) { - final PsiType type = aSubst.substitute(parm); + for (PsiTypeParameter parm : PsiUtil.typeParametersIterable(aClass)) { + final PsiType type = aSubst.substitute(parm); - if (type != null){ - final Boolean b = type.accept(this); + if (type != null) { + final Boolean b = type.accept(this); - if (! b.booleanValue()){ - return Boolean.FALSE; - } - } - } + if (!b.booleanValue()) { + return Boolean.FALSE; + } + } + } - return Boolean.TRUE; - } - else { - return Boolean.FALSE; - } - } - }).booleanValue(); + return Boolean.TRUE; + } + else { + return Boolean.FALSE; + } + } + }).booleanValue(); } public String getPresentableText() { diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Constraint.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Constraint.java index b987e2d9d887..afb4691c2ad9 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Constraint.java +++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Constraint.java @@ -15,16 +15,12 @@ */ package com.intellij.refactoring.typeCook.deductive.builder; -import com.intellij.psi.PsiType; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.psi.PsiType; import com.intellij.refactoring.typeCook.deductive.resolver.Binding; /** - * Created by IntelliJ IDEA. - * User: db - * Date: Jul 20, 2004 - * Time: 6:00:28 PM - * To change this template use File | Settings | File Templates. + * @author db */ public abstract class Constraint { private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.typeCook.deductive.builder.Constraint"); diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Subtype.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Subtype.java index e60951413694..754b7453bd8b 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Subtype.java +++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/Subtype.java @@ -19,11 +19,7 @@ import com.intellij.psi.PsiType; import com.intellij.refactoring.typeCook.deductive.resolver.Binding; /** - * Created by IntelliJ IDEA. - * User: db - * Date: Jul 20, 2004 - * Time: 6:02:29 PM - * To change this template use File | Settings | File Templates. + * @author db */ public class Subtype extends Constraint { public Subtype(PsiType left, PsiType right) { diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/util/VictimCollector.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/util/VictimCollector.java index 5ea95ae5e86b..370c2d2b2989 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/util/VictimCollector.java +++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/util/VictimCollector.java @@ -22,11 +22,7 @@ import com.intellij.refactoring.typeCook.Util; import java.util.HashSet; /** - * Created by IntelliJ IDEA. - * User: db - * Date: Jul 5, 2004 - * Time: 6:45:51 PM - * To change this template use File | Settings | File Templates. + * @author db */ public class VictimCollector extends Visitor { final HashSet myVictims = new HashSet(); diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/util/Visitor.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/util/Visitor.java index 5b11bc030ee3..1838ae91cb2e 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/util/Visitor.java +++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/util/Visitor.java @@ -18,26 +18,20 @@ package com.intellij.refactoring.typeCook.deductive.util; import com.intellij.psi.*; /** - * Created by IntelliJ IDEA. - * User: db - * Date: Jul 5, 2004 - * Time: 6:44:49 PM - * To change this template use File | Settings | File Templates. + * @author db */ public abstract class Visitor extends JavaRecursiveElementWalkingVisitor { @Override public void visitPackage(final PsiPackage aPackage) { final PsiDirectory[] dirs = aPackage.getDirectories(); - for (int i = 0; i < dirs.length; i++) { - final PsiFile[] files = dirs[i].getFiles(); - - for (int j = 0; j < files.length; j++) { - final PsiFile file = files[j]; + for (PsiDirectory dir : dirs) { + final PsiFile[] files = dir.getFiles(); + for (final PsiFile file : files) { if (file instanceof PsiJavaFile) { super.visitJavaFile(((PsiJavaFile)file)); } } } } -} \ No newline at end of file +} diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/CustomFileTypeCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/CustomFileTypeCompletionTest.java index 384f491b7e65..ef35e95fd909 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/CustomFileTypeCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/CustomFileTypeCompletionTest.java @@ -3,11 +3,7 @@ package com.intellij.codeInsight.completion; import com.intellij.JavaTestUtil; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Oct 14, 2004 - * Time: 4:39:37 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public class CustomFileTypeCompletionTest extends LightCompletionTestCase { private static final String BASE_PATH = "/codeInsight/completion/customFileType/"; diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/WordCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/WordCompletionTest.java index 22613915de80..772d769a79ab 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/WordCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/WordCompletionTest.java @@ -11,11 +11,7 @@ import com.intellij.util.ProcessingContext; import org.jetbrains.annotations.NotNull; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Oct 14, 2004 - * Time: 4:39:37 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public class WordCompletionTest extends CompletionTestCase { private static final String BASE_PATH = "/codeInsight/completion/word/"; diff --git a/java/jsp-base-openapi/src/com/intellij/lang/jsp/IBaseJspManager.java b/java/jsp-base-openapi/src/com/intellij/lang/jsp/IBaseJspManager.java index 52ac367ed5fe..a7fabc4e3bf5 100644 --- a/java/jsp-base-openapi/src/com/intellij/lang/jsp/IBaseJspManager.java +++ b/java/jsp-base-openapi/src/com/intellij/lang/jsp/IBaseJspManager.java @@ -15,18 +15,14 @@ */ package com.intellij.lang.jsp; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.NotNull; +import com.intellij.psi.PsiFile; import com.intellij.xml.XmlElementDescriptor; import com.intellij.xml.XmlNSDescriptor; -import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: 20.04.2009 - * Time: 17:07:57 - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public interface IBaseJspManager { XmlNSDescriptor getActionsLibrary(@NotNull PsiFile containingFile); diff --git a/java/jsp-base-openapi/src/com/intellij/lang/jsp/JspFileViewProvider.java b/java/jsp-base-openapi/src/com/intellij/lang/jsp/JspFileViewProvider.java index f1bb9cf5b460..d0bb429508c0 100644 --- a/java/jsp-base-openapi/src/com/intellij/lang/jsp/JspFileViewProvider.java +++ b/java/jsp-base-openapi/src/com/intellij/lang/jsp/JspFileViewProvider.java @@ -22,14 +22,11 @@ import org.jetbrains.annotations.NotNull; import java.util.Set; /** - * Created by IntelliJ IDEA. - * User: ik - * Date: Dec 12, 2005 - * Time: 3:28:22 PM - * To change this template use File | Settings | File Templates. + * @author ik */ public interface JspFileViewProvider extends JspxFileViewProvider { @NotNull Language getTemplateDataLanguage(); + Set getKnownTaglibPrefixes(); } diff --git a/java/jsp-base-openapi/src/com/intellij/lang/jsp/JspxFileViewProvider.java b/java/jsp-base-openapi/src/com/intellij/lang/jsp/JspxFileViewProvider.java index 3c960d432bb0..31784036be6f 100644 --- a/java/jsp-base-openapi/src/com/intellij/lang/jsp/JspxFileViewProvider.java +++ b/java/jsp-base-openapi/src/com/intellij/lang/jsp/JspxFileViewProvider.java @@ -16,21 +16,17 @@ package com.intellij.lang.jsp; -import com.intellij.lang.Language; import com.intellij.lang.DependentLanguage; +import com.intellij.lang.Language; import com.intellij.psi.templateLanguages.TemplateLanguageFileViewProvider; /** - * Created by IntelliJ IDEA. - * User: ik - * Date: Dec 12, 2005 - * Time: 7:40:40 PM - * To change this template use File | Settings | File Templates. + * @author ik */ public interface JspxFileViewProvider extends TemplateLanguageFileViewProvider { Language JAVA_HOLDER_METHOD_TREE_LANGUAGE = new JavaHolderMethodTreeLanguage(); - public static class JavaHolderMethodTreeLanguage extends Language implements DependentLanguage{ + class JavaHolderMethodTreeLanguage extends Language implements DependentLanguage{ public JavaHolderMethodTreeLanguage() { super("JAVA_HOLDER_METHOD_TREE", ""); } diff --git a/java/jsp-base-openapi/src/com/intellij/lexer/ELHostLexer.java b/java/jsp-base-openapi/src/com/intellij/lexer/ELHostLexer.java index 6c0bbe95dde1..9a8c60220781 100644 --- a/java/jsp-base-openapi/src/com/intellij/lexer/ELHostLexer.java +++ b/java/jsp-base-openapi/src/com/intellij/lexer/ELHostLexer.java @@ -18,12 +18,8 @@ package com.intellij.lexer; import com.intellij.psi.tree.IElementType; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: May 13, 2005 - * Time: 1:34:29 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public interface ELHostLexer { - void setElTypes(IElementType elTokenTypeForContent,IElementType elTokenTypeForAttribute); + void setElTypes(IElementType elTokenTypeForContent, IElementType elTokenTypeForAttribute); } diff --git a/java/jsp-spi/src/com/intellij/jsp/impl/TldAttributeDescriptor.java b/java/jsp-spi/src/com/intellij/jsp/impl/TldAttributeDescriptor.java index 781d05524941..5dbc7024806a 100644 --- a/java/jsp-spi/src/com/intellij/jsp/impl/TldAttributeDescriptor.java +++ b/java/jsp-spi/src/com/intellij/jsp/impl/TldAttributeDescriptor.java @@ -19,22 +19,20 @@ import com.intellij.xml.XmlAttributeDescriptor; import org.jetbrains.annotations.Nullable; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Jan 26, 2007 - * Time: 7:03:23 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public interface TldAttributeDescriptor extends XmlAttributeDescriptor { /** * Indicates that attribute is a fragment + * * @return */ boolean isIndirectSyntax(); /** * Returns method signature for deferred methods + * * @return */ @Nullable @@ -42,6 +40,7 @@ public interface TldAttributeDescriptor extends XmlAttributeDescriptor { /** * Returns value of "type" subtag + * * @return */ @Nullable diff --git a/platform/lang-api/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterProcessor.java b/platform/lang-api/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterProcessor.java index 416750fafc9e..4c88a5aede99 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterProcessor.java +++ b/platform/lang-api/src/com/intellij/codeInsight/editorActions/smartEnter/SmartEnterProcessor.java @@ -31,11 +31,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** - * Created by IntelliJ IDEA. - * User: max - * Date: Sep 5, 2003 - * Time: 3:31:23 PM - * To change this template use Options | File Templates. + * @author max */ public abstract class SmartEnterProcessor { public abstract boolean process(@NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile psiFile); diff --git a/platform/lang-api/src/com/intellij/diagnostic/logging/IndependentLogFilter.java b/platform/lang-api/src/com/intellij/diagnostic/logging/IndependentLogFilter.java index f3a99a13781b..b4ffe858df94 100644 --- a/platform/lang-api/src/com/intellij/diagnostic/logging/IndependentLogFilter.java +++ b/platform/lang-api/src/com/intellij/diagnostic/logging/IndependentLogFilter.java @@ -17,11 +17,7 @@ package com.intellij.diagnostic.logging; /** - * Created by IntelliJ IDEA. - * User: Eugene.Kudelevsky - * Date: Sep 11, 2009 - * Time: 2:34:25 PM - * To change this template use File | Settings | File Templates. + * @author Eugene.Kudelevsky */ public abstract class IndependentLogFilter extends LogFilter { protected IndependentLogFilter(String name) { diff --git a/platform/lang-api/src/com/intellij/execution/ExecutionBundle.java b/platform/lang-api/src/com/intellij/execution/ExecutionBundle.java index af072abc1c3e..a9f20c7be1f3 100644 --- a/platform/lang-api/src/com/intellij/execution/ExecutionBundle.java +++ b/platform/lang-api/src/com/intellij/execution/ExecutionBundle.java @@ -24,11 +24,7 @@ import java.lang.ref.SoftReference; import java.util.ResourceBundle; /** - * Created by IntelliJ IDEA. - * User: lesya - * Date: Aug 29, 2005 - * Time: 11:45:48 PM - * To change this template use File | Settings | File Templates. + * @author lesya */ public class ExecutionBundle { private static Reference ourBundle; diff --git a/platform/lang-api/src/com/intellij/pom/PomTransaction.java b/platform/lang-api/src/com/intellij/pom/PomTransaction.java index b8ff3c90802f..679b00a45050 100644 --- a/platform/lang-api/src/com/intellij/pom/PomTransaction.java +++ b/platform/lang-api/src/com/intellij/pom/PomTransaction.java @@ -20,15 +20,14 @@ import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; /** - * Created by IntelliJ IDEA. - * User: ik - * Date: Oct 6, 2004 - * Time: 9:48:15 PM - * To change this template use File | Settings | File Templates. + * @author ik */ -public interface PomTransaction{ +public interface PomTransaction { PomModelEvent getAccumulatedEvent(); + void run() throws IncorrectOperationException; + PsiElement getChangeScope(); + PomModelAspect getTransactionAspect(); } diff --git a/platform/lang-api/src/com/intellij/pom/tree/events/TreeChange.java b/platform/lang-api/src/com/intellij/pom/tree/events/TreeChange.java index 904497e1855d..ab2cd838c742 100644 --- a/platform/lang-api/src/com/intellij/pom/tree/events/TreeChange.java +++ b/platform/lang-api/src/com/intellij/pom/tree/events/TreeChange.java @@ -18,21 +18,19 @@ package com.intellij.pom.tree.events; import com.intellij.lang.ASTNode; /** - * Created by IntelliJ IDEA. - * User: ik - * Date: Oct 6, 2004 - * Time: 11:00:28 PM - * To change this template use File | Settings | File Templates. + * @author ik */ - public interface TreeChange { void addChange(ASTNode child, ChangeInfo changeInfo); ASTNode[] getAffectedChildren(); + ChangeInfo getChangeByChild(ASTNode child); + int getChildOffsetInNewTree(ASTNode child); void composite(TreeChange treeChange); + boolean isEmpty(); void removeChange(ASTNode beforeEqualDepth); diff --git a/platform/lang-api/src/com/intellij/pom/tree/events/TreeChangeEvent.java b/platform/lang-api/src/com/intellij/pom/tree/events/TreeChangeEvent.java index 8cc8097a10fb..4485fe63e7ff 100644 --- a/platform/lang-api/src/com/intellij/pom/tree/events/TreeChangeEvent.java +++ b/platform/lang-api/src/com/intellij/pom/tree/events/TreeChangeEvent.java @@ -19,17 +19,16 @@ import com.intellij.lang.ASTNode; import com.intellij.pom.event.PomChangeSet; /** - * Created by IntelliJ IDEA. - * User: ik - * Date: Oct 6, 2004 - * Time: 10:56:52 PM - * To change this template use File | Settings | File Templates. + * @author ik */ -public interface TreeChangeEvent extends PomChangeSet{ +public interface TreeChangeEvent extends PomChangeSet { ASTNode getRootElement(); + ASTNode[] getChangedElements(); + TreeChange getChangesByElement(ASTNode element); void addElementaryChange(ASTNode child, ChangeInfo change); + void clear(); } diff --git a/platform/lang-api/src/com/intellij/psi/meta/PsiWritableMetaData.java b/platform/lang-api/src/com/intellij/psi/meta/PsiWritableMetaData.java index e5c58507f1d0..223efe6be092 100644 --- a/platform/lang-api/src/com/intellij/psi/meta/PsiWritableMetaData.java +++ b/platform/lang-api/src/com/intellij/psi/meta/PsiWritableMetaData.java @@ -18,11 +18,7 @@ package com.intellij.psi.meta; import com.intellij.util.IncorrectOperationException; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Apr 18, 2005 - * Time: 2:41:47 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public interface PsiWritableMetaData extends PsiMetaData { void setName(String name) throws IncorrectOperationException; diff --git a/platform/lang-api/src/com/intellij/usageView/UsageViewBundle.java b/platform/lang-api/src/com/intellij/usageView/UsageViewBundle.java index 799cec328b11..ebbff1026939 100644 --- a/platform/lang-api/src/com/intellij/usageView/UsageViewBundle.java +++ b/platform/lang-api/src/com/intellij/usageView/UsageViewBundle.java @@ -25,11 +25,7 @@ import java.lang.ref.SoftReference; import java.util.ResourceBundle; /** - * Created by IntelliJ IDEA. - * User: yole - * Date: 11.08.2005 - * Time: 16:04:31 - * To change this template use File | Settings | File Templates. + * @author yole */ public class UsageViewBundle { private static Reference ourBundle; diff --git a/platform/lang-api/src/com/intellij/util/CharTable.java b/platform/lang-api/src/com/intellij/util/CharTable.java index a54730d6645a..3355e1bdce49 100644 --- a/platform/lang-api/src/com/intellij/util/CharTable.java +++ b/platform/lang-api/src/com/intellij/util/CharTable.java @@ -18,13 +18,9 @@ package com.intellij.util; import com.intellij.openapi.util.Key; /** - * Created by IntelliJ IDEA. - * User: ik - * Date: 07.06.2004 - * Time: 15:28:03 - * To change this template use File | Settings | File Templates. + * @author ik */ -public interface CharTable{ +public interface CharTable { int PAGE_SIZE = 256; Key CHAR_TABLE_KEY = new Key("Char table"); diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/ColorSettingsUtil.java b/platform/lang-impl/src/com/intellij/application/options/colors/ColorSettingsUtil.java index 4dce0422bb92..4bdca9d42a14 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/ColorSettingsUtil.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/ColorSettingsUtil.java @@ -16,24 +16,23 @@ package com.intellij.application.options.colors; -import com.intellij.openapi.editor.colors.TextAttributesKey; -import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.colors.EditorColorsManager; +import com.intellij.openapi.editor.colors.EditorColorsScheme; +import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.editor.colors.impl.EditorColorsManagerImpl; -import com.intellij.openapi.options.colors.ColorSettingsPage; import com.intellij.openapi.options.colors.AttributesDescriptor; +import com.intellij.openapi.options.colors.ColorSettingsPage; import com.intellij.util.containers.HashMap; import java.util.Map; /** - * Created by IntelliJ IDEA. - * User: lesya - * Date: Oct 23, 2008 - * Time: 4:28:18 PM - * To change this template use File | Settings | File Templates. + * @author lesya */ public class ColorSettingsUtil { + private ColorSettingsUtil() { + } + public static Map keyToDisplayTextMap(final ColorSettingsPage page) { final AttributesDescriptor[] attributeDescriptors = page.getAttributeDescriptors(); final Map displayText = new HashMap(); diff --git a/platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.java index cbd28327db47..ac87af126244 100644 --- a/platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.java @@ -16,15 +16,15 @@ package com.intellij.application.options.editor; -import com.intellij.openapi.options.ConfigurationException; -import com.intellij.openapi.application.ApplicationBundle; import com.intellij.ide.ui.UISettings; +import com.intellij.openapi.application.ApplicationBundle; +import com.intellij.openapi.options.ConfigurationException; import org.jetbrains.annotations.Nls; import javax.swing.*; import java.awt.*; -import java.awt.event.ItemListener; import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; /** * @author yole @@ -76,7 +76,7 @@ public class EditorTabsConfigurable implements EditorOptionsProvider { } public Icon getIcon() { - return null; //To change body of implemented methods use File | Settings | File Templates. + return null; } public String getHelpTopic() { @@ -151,7 +151,7 @@ public class EditorTabsConfigurable implements EditorOptionsProvider { public boolean isModified() { final UISettings uiSettings = UISettings.getInstance(); - boolean isModified = isModified(myCbModifiedTabsMarkedWithAsterisk, uiSettings.MARK_MODIFIED_TABS_WITH_ASTERISK);; + boolean isModified = isModified(myCbModifiedTabsMarkedWithAsterisk, uiSettings.MARK_MODIFIED_TABS_WITH_ASTERISK); isModified |= isModified(myEditorTabLimitField, uiSettings.EDITOR_TAB_LIMIT); int tabPlacement = ((Integer)myEditorTabPlacement.getSelectedItem()).intValue(); isModified |= tabPlacement != uiSettings.EDITOR_TAB_PLACEMENT; @@ -167,7 +167,6 @@ public class EditorTabsConfigurable implements EditorOptionsProvider { } public void disposeUIResources() { - //To change body of implemented methods use File | Settings | File Templates. } @@ -196,16 +195,16 @@ public class EditorTabsConfigurable implements EditorOptionsProvider { if (UISettings.TABS_NONE == tabPlacement) { text = ApplicationBundle.message("combobox.tab.placement.none"); } - else if (SwingConstants.TOP == tabPlacement) { + else if (TOP == tabPlacement) { text = ApplicationBundle.message("combobox.tab.placement.top"); } - else if (SwingConstants.LEFT == tabPlacement) { + else if (LEFT == tabPlacement) { text = ApplicationBundle.message("combobox.tab.placement.left"); } - else if (SwingConstants.BOTTOM == tabPlacement) { + else if (BOTTOM == tabPlacement) { text = ApplicationBundle.message("combobox.tab.placement.bottom"); } - else if (SwingConstants.RIGHT == tabPlacement) { + else if (RIGHT == tabPlacement) { text = ApplicationBundle.message("combobox.tab.placement.right"); } else { diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/CodeEditorBundle.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/CodeEditorBundle.java index 0655833eaacf..ab636b1f9fd4 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/CodeEditorBundle.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/CodeEditorBundle.java @@ -25,11 +25,7 @@ import java.lang.ref.SoftReference; import java.util.ResourceBundle; /** - * Created by IntelliJ IDEA. - * User: yole - * Date: 30.08.2005 - * Time: 18:49:13 - * To change this template use File | Settings | File Templates. + * @author yole */ public class CodeEditorBundle { private static Reference ourBundle; diff --git a/platform/lang-impl/src/com/intellij/codeEditor/printing/HelpID.java b/platform/lang-impl/src/com/intellij/codeEditor/printing/HelpID.java index f85b5654ec1f..973825c47c49 100644 --- a/platform/lang-impl/src/com/intellij/codeEditor/printing/HelpID.java +++ b/platform/lang-impl/src/com/intellij/codeEditor/printing/HelpID.java @@ -19,11 +19,7 @@ package com.intellij.codeEditor.printing; import org.jetbrains.annotations.NonNls; /** - * Created by IntelliJ IDEA. - * User: Alexander.Chernikov - * Date: 20.10.2006 - * Time: 18:55:05 - * To change this template use File | Settings | File Templates. + * @author Alexander.Chernikov */ public interface HelpID { @NonNls String EXPORT_TO_HTML = "reference.file.exportToHtml"; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionVariant.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionVariant.java index a0f643b15c08..ab9607da4ab8 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionVariant.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionVariant.java @@ -34,13 +34,8 @@ import org.jetbrains.annotations.NonNls; import java.util.*; /** - * Created by IntelliJ IDEA. - * User: ik - * Date: 31.01.2003 - * Time: 17:38:14 - * To change this template use Options | File Templates. + * @author ik */ - public class CompletionVariant { protected static final TailType DEFAULT_TAIL_TYPE = TailType.SPACE; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/KeywordChooser.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/KeywordChooser.java index 8a330e8cbf0d..7f5bbfb79333 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/KeywordChooser.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/KeywordChooser.java @@ -19,11 +19,7 @@ package com.intellij.codeInsight.completion; import com.intellij.psi.PsiElement; /** - * Created by IntelliJ IDEA. - * User: ik - * Date: 17.02.2003 - * Time: 16:53:09 - * To change this template use Options | File Templates. + * @author ik */ public interface KeywordChooser{ String[] getKeywords(CompletionContext context, PsiElement position); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/SyntaxTableCompletionData.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/SyntaxTableCompletionData.java index 7f2c4e5d76b8..3ab6579593ab 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/SyntaxTableCompletionData.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/SyntaxTableCompletionData.java @@ -22,11 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.filters.TrueFilter; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Oct 14, 2004 - * Time: 4:28:39 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public class SyntaxTableCompletionData extends CompletionData{ private final SyntaxTable mySyntaxTable; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieWordCompletionHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieWordCompletionHandler.java index 888c1b770006..5207f8d26456 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieWordCompletionHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieWordCompletionHandler.java @@ -35,11 +35,7 @@ import org.jetbrains.annotations.Nullable; import java.util.*; /** - * Created by IntelliJ IDEA. - * User: mike - * Date: May 11, 2006 - * Time: 3:48:48 PM - * To change this template use File | Settings | File Templates. + * @author mike */ public class HippieWordCompletionHandler implements CodeInsightActionHandler { private static final Key KEY_STATE = new Key("HIPPIE_COMPLETION_STATE"); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/Validator.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/Validator.java index 73572efff971..2b208430901a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/Validator.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/Validator.java @@ -21,11 +21,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Jan 14, 2005 - * Time: 10:53:20 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public interface Validator { interface ValidationHost { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CollapseSelectionHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CollapseSelectionHandler.java index 4f6a575093da..fcf6e1cf7361 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CollapseSelectionHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/CollapseSelectionHandler.java @@ -27,11 +27,7 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; /** - * Created by IntelliJ IDEA. - * User: ven - * Date: Apr 10, 2003 - * Time: 8:52:53 PM - * To change this template use Options | File Templates. + * @author ven */ public class CollapseSelectionHandler implements CodeInsightActionHandler { private static final String ourPlaceHolderText = "..."; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseSelectionAction.java b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseSelectionAction.java index 056a160ea5c5..66d877fdea6d 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseSelectionAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/folding/impl/actions/CollapseSelectionAction.java @@ -16,17 +16,13 @@ package com.intellij.codeInsight.folding.impl.actions; -import com.intellij.codeInsight.actions.BaseCodeInsightAction; import com.intellij.codeInsight.CodeInsightActionHandler; +import com.intellij.codeInsight.actions.BaseCodeInsightAction; import com.intellij.codeInsight.folding.impl.CollapseSelectionHandler; import com.intellij.openapi.project.DumbAware; /** - * Created by IntelliJ IDEA. - * User: ven - * Date: Apr 10, 2003 - * Time: 9:59:35 PM - * To change this template use Options | File Templates. + * @author ven */ public class CollapseSelectionAction extends BaseCodeInsightAction implements DumbAware { protected CodeInsightActionHandler getHandler() { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/DeferredUserLookupValue.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/DeferredUserLookupValue.java index 2c9d2ab01ad6..f2a4f3c5dd5e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/DeferredUserLookupValue.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/DeferredUserLookupValue.java @@ -19,13 +19,9 @@ package com.intellij.codeInsight.lookup; import com.intellij.openapi.project.Project; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Sep 29, 2004 - * Time: 7:38:32 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko * @deprecated use InsertHandler */ public interface DeferredUserLookupValue extends PresentableLookupValue { - boolean handleUserSelection(LookupItem item,Project project); + boolean handleUserSelection(LookupItem item, Project project); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueWithPriority.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueWithPriority.java index e28fe445fb07..ab5b1b80d326 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueWithPriority.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueWithPriority.java @@ -17,16 +17,12 @@ package com.intellij.codeInsight.lookup; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Jun 20, 2005 - * Time: 8:12:52 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public interface LookupValueWithPriority { int NORMAL = 0; int HIGHER = 1; int HIGH = 2; - + int getPriority(); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueWithPsiElement.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueWithPsiElement.java index 325a9e807367..62f892cc5843 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueWithPsiElement.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueWithPsiElement.java @@ -19,11 +19,7 @@ package com.intellij.codeInsight.lookup; import com.intellij.psi.PsiElement; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Jun 20, 2005 - * Time: 8:12:52 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public interface LookupValueWithPsiElement { PsiElement getElement(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueWithUIHint.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueWithUIHint.java index 41099f43d338..883067a81c4b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueWithUIHint.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/LookupValueWithUIHint.java @@ -19,15 +19,13 @@ package com.intellij.codeInsight.lookup; import java.awt.*; /** - * Created by IntelliJ IDEA. - * User: maxim - * Date: 10.12.2004 - * Time: 13:25:56 - * To change this template use File | Settings | File Templates. + * @author maxim * @deprecated use InsertHandler */ public interface LookupValueWithUIHint extends PresentableLookupValue { String getTypeHint(); + Color getColorHint(); + boolean isBold(); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/PresentableLookupValue.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/PresentableLookupValue.java index b19d5279876a..ccb253b00c0f 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/PresentableLookupValue.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/PresentableLookupValue.java @@ -17,13 +17,9 @@ package com.intellij.codeInsight.lookup; /** - * Created by IntelliJ IDEA. - * User: maxim - * Date: 10.12.2004 - * Time: 13:38:25 - * To change this template use File | Settings | File Templates. + * @author maxim * @deprecated use LookupElementBuilder */ public interface PresentableLookupValue { - String getPresentation(); + String getPresentation(); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/FileTypeBasedContextType.java b/platform/lang-impl/src/com/intellij/codeInsight/template/FileTypeBasedContextType.java index 523257895803..d88aea4facb0 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/FileTypeBasedContextType.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/FileTypeBasedContextType.java @@ -20,15 +20,11 @@ import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.LanguageFileType; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.psi.PsiFile; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; /** - * Created by IntelliJ IDEA. - * User: lesya - * Date: Jul 28, 2008 - * Time: 4:53:26 PM - * To change this template use File | Settings | File Templates. + * @author lesya */ public abstract class FileTypeBasedContextType extends TemplateContextType { private final LanguageFileType myFileType; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateImplUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateImplUtil.java index 34114bfb0d60..d4261d2855ac 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateImplUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/TemplateImplUtil.java @@ -24,13 +24,12 @@ import java.util.ArrayList; import java.util.Set; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Mar 19, 2004 - * Time: 1:28:54 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public class TemplateImplUtil { + private TemplateImplUtil() { + } + public static boolean validateTemplateText(String s) { TemplateTextLexer lexer = new TemplateTextLexer(); lexer.start(s); diff --git a/platform/lang-impl/src/com/intellij/find/FindBundle.java b/platform/lang-impl/src/com/intellij/find/FindBundle.java index 3d3a2ecf03a2..ea7e68cc8472 100644 --- a/platform/lang-impl/src/com/intellij/find/FindBundle.java +++ b/platform/lang-impl/src/com/intellij/find/FindBundle.java @@ -25,11 +25,7 @@ import java.lang.ref.SoftReference; import java.util.ResourceBundle; /** - * Created by IntelliJ IDEA. - * User: yole - * Date: 31.08.2005 - * Time: 13:20:15 - * To change this template use File | Settings | File Templates. + * @author yole */ public class FindBundle { private static Reference ourBundle; diff --git a/platform/lang-impl/src/com/intellij/find/findUsages/CommonFindUsagesDialog.java b/platform/lang-impl/src/com/intellij/find/findUsages/CommonFindUsagesDialog.java index bf96889a8275..f0346d309ea0 100644 --- a/platform/lang-impl/src/com/intellij/find/findUsages/CommonFindUsagesDialog.java +++ b/platform/lang-impl/src/com/intellij/find/findUsages/CommonFindUsagesDialog.java @@ -16,9 +16,9 @@ package com.intellij.find.findUsages; +import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.help.HelpManager; import com.intellij.psi.PsiElement; import com.intellij.psi.search.LocalSearchScope; import com.intellij.usageView.UsageViewUtil; @@ -26,11 +26,7 @@ import com.intellij.usageView.UsageViewUtil; import javax.swing.*; /** - * Created by IntelliJ IDEA. - * User: max - * Date: Feb 14, 2005 - * Time: 5:40:05 PM - * To change this template use File | Settings | File Templates. + * @author max */ public class CommonFindUsagesDialog extends AbstractFindUsagesDialog { private final PsiElement myPsiElement; diff --git a/platform/lang-impl/src/com/intellij/formatting/AbstractBlockWrapper.java b/platform/lang-impl/src/com/intellij/formatting/AbstractBlockWrapper.java index 87003242f15f..ee3a329a2295 100644 --- a/platform/lang-impl/src/com/intellij/formatting/AbstractBlockWrapper.java +++ b/platform/lang-impl/src/com/intellij/formatting/AbstractBlockWrapper.java @@ -22,11 +22,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; import java.util.ArrayList; /** - * Created by IntelliJ IDEA. - * User: lesya - * Date: Apr 14, 2005 - * Time: 9:40:01 PM - * To change this template use File | Settings | File Templates. + * @author lesya */ public abstract class AbstractBlockWrapper { protected WhiteSpace myWhiteSpace; diff --git a/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeBraceMatcher.java b/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeBraceMatcher.java index 1c7c996e2810..a33cd28629f0 100644 --- a/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeBraceMatcher.java +++ b/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeBraceMatcher.java @@ -26,11 +26,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Dec 6, 2004 - * Time: 8:36:58 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ class CustomFileTypeBraceMatcher implements BraceMatcher { public int getBraceTokenGroupId(IElementType tokenType) { diff --git a/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeQuoteHandler.java b/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeQuoteHandler.java index 7507656cdc6f..2c9c64c8550b 100644 --- a/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeQuoteHandler.java +++ b/platform/lang-impl/src/com/intellij/ide/highlighter/custom/impl/CustomFileTypeQuoteHandler.java @@ -24,11 +24,7 @@ import com.intellij.psi.CustomHighlighterTokenType; import com.intellij.psi.tree.IElementType; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Dec 6, 2004 - * Time: 8:34:21 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ class CustomFileTypeQuoteHandler implements QuoteHandler { public boolean isClosingQuote(HighlighterIterator iterator, int offset) { diff --git a/platform/lang-impl/src/com/intellij/ide/highlighter/custom/tokens/BraceTokenParser.java b/platform/lang-impl/src/com/intellij/ide/highlighter/custom/tokens/BraceTokenParser.java index d40d7693dc62..dea3904e99a7 100644 --- a/platform/lang-impl/src/com/intellij/ide/highlighter/custom/tokens/BraceTokenParser.java +++ b/platform/lang-impl/src/com/intellij/ide/highlighter/custom/tokens/BraceTokenParser.java @@ -19,11 +19,7 @@ package com.intellij.ide.highlighter.custom.tokens; import com.intellij.psi.tree.IElementType; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Dec 6, 2004 - * Time: 7:40:12 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public class BraceTokenParser extends PrefixedTokenParser { public BraceTokenParser(String prefix, IElementType tokenType) { diff --git a/platform/lang-impl/src/com/intellij/ide/structureView/StructureViewWrapper.java b/platform/lang-impl/src/com/intellij/ide/structureView/StructureViewWrapper.java index 78bdb6f9288b..17edcf03b9e1 100644 --- a/platform/lang-impl/src/com/intellij/ide/structureView/StructureViewWrapper.java +++ b/platform/lang-impl/src/com/intellij/ide/structureView/StructureViewWrapper.java @@ -20,11 +20,7 @@ import com.intellij.openapi.fileEditor.FileEditor; import com.intellij.openapi.vfs.VirtualFile; /** - * Created by IntelliJ IDEA. - * User: lesya - * Date: Feb 23, 2005 - * Time: 7:19:02 PM - * To change this template use File | Settings | File Templates. + * @author lesya */ public interface StructureViewWrapper { boolean selectCurrentElement(FileEditor fileEditor, VirtualFile file, boolean requestFocus); diff --git a/platform/lang-impl/src/com/intellij/lang/LangBundle.java b/platform/lang-impl/src/com/intellij/lang/LangBundle.java index 3dc2b2aecbf6..ceab51505f01 100644 --- a/platform/lang-impl/src/com/intellij/lang/LangBundle.java +++ b/platform/lang-impl/src/com/intellij/lang/LangBundle.java @@ -25,11 +25,7 @@ import java.lang.ref.SoftReference; import java.util.ResourceBundle; /** - * Created by IntelliJ IDEA. - * User: yole - * Date: 12.09.2005 - * Time: 18:03:21 - * To change this template use File | Settings | File Templates. + * @author yole */ public class LangBundle { private static Reference ourBundle; diff --git a/platform/lang-impl/src/com/intellij/pom/tree/events/impl/TreeChangeEventImpl.java b/platform/lang-impl/src/com/intellij/pom/tree/events/impl/TreeChangeEventImpl.java index def3b1dbc4b8..e36accb9a054 100644 --- a/platform/lang-impl/src/com/intellij/pom/tree/events/impl/TreeChangeEventImpl.java +++ b/platform/lang-impl/src/com/intellij/pom/tree/events/impl/TreeChangeEventImpl.java @@ -31,11 +31,7 @@ import gnu.trove.THashMap; import java.util.*; /** - * Created by IntelliJ IDEA. - * User: ik - * Date: Oct 6, 2004 - * Time: 11:11:40 PM - * To change this template use File | Settings | File Templates. + * @author ik */ public class TreeChangeEventImpl implements TreeChangeEvent{ private final Map myChangedElements = new THashMap(); diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/AbstractPostFormatProcessor.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/AbstractPostFormatProcessor.java index 3957018cfaeb..5d1cb0e7f039 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/AbstractPostFormatProcessor.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/AbstractPostFormatProcessor.java @@ -21,11 +21,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; import org.jetbrains.annotations.Nullable; /** - * Created by IntelliJ IDEA. - * User: lesya - * Date: Jul 21, 2005 - * Time: 7:53:12 PM - * To change this template use File | Settings | File Templates. + * @author lesya */ public class AbstractPostFormatProcessor { protected final CodeStyleSettings mySettings; diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/AffectedTextRange.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/AffectedTextRange.java deleted file mode 100644 index f192707dcde2..000000000000 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/AffectedTextRange.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2000-2009 JetBrains s.r.o. - * - * 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. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.intellij.psi.impl.source.codeStyle; - -import com.intellij.openapi.util.TextRange; - -/** - * Created by IntelliJ IDEA. - * User: lesya - * Date: Nov 26, 2008 - * Time: 6:26:45 PM - * To change this template use File | Settings | File Templates. - */ -public class AffectedTextRange extends TextRange { - private final boolean myProcessHeadingWhiteSpace; - - public AffectedTextRange(final int startOffset, final int endOffset, final boolean processHeadingWhiteSpace) { - super(startOffset, endOffset); - myProcessHeadingWhiteSpace = processHeadingWhiteSpace; - } - - public AffectedTextRange(final TextRange affectedRange, final boolean processHeadingWhitespace) { - this(affectedRange.getStartOffset(), affectedRange.getEndOffset(), processHeadingWhitespace); - } - - public boolean isProcessHeadingWhiteSpace() { - return myProcessHeadingWhiteSpace; - } -} diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/parsing/ParseUtilBase.java b/platform/lang-impl/src/com/intellij/psi/impl/source/parsing/ParseUtilBase.java index b9603a9bda6f..e5592643e0c8 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/parsing/ParseUtilBase.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/parsing/ParseUtilBase.java @@ -16,19 +16,15 @@ package com.intellij.psi.impl.source.parsing; -import com.intellij.psi.impl.source.tree.TreeElement; -import com.intellij.psi.tree.IElementType; +import com.intellij.lang.ASTFactory; import com.intellij.lexer.Lexer; import com.intellij.lexer.LexerUtil; +import com.intellij.psi.impl.source.tree.TreeElement; +import com.intellij.psi.tree.IElementType; import com.intellij.util.CharTable; -import com.intellij.lang.ASTFactory; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: 20.04.2009 - * Time: 15:02:52 - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public class ParseUtilBase { public static TreeElement createTokenElement(Lexer lexer, CharTable table) { diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/CustomizingReferenceProvider.java b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/CustomizingReferenceProvider.java index 41aa37b3dc07..ad10402686e8 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/CustomizingReferenceProvider.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/CustomizingReferenceProvider.java @@ -27,15 +27,11 @@ import java.util.HashMap; import java.util.Map; /** - * Created by IntelliJ IDEA. - * User: Maxim.Mossienko - * Date: Nov 9, 2005 - * Time: 8:10:06 PM - * To change this template use File | Settings | File Templates. + * @author Maxim.Mossienko */ public class CustomizingReferenceProvider extends PsiReferenceProvider implements CustomizableReferenceProvider { private final CustomizableReferenceProvider myProvider; - private @Nullable Map myOptions; + private @Nullable Map myOptions; public CustomizingReferenceProvider(@NotNull CustomizableReferenceProvider provider) { myProvider = provider; @@ -43,7 +39,7 @@ public class CustomizingReferenceProvider extends PsiReferenceProvider implement public