From 8fad4b49675d1ae79d09656530a6ab3d869cccdf Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 12 Nov 2009 18:47:25 +0300 Subject: [PATCH] cleanup --- .../roots/ui/configuration/ClasspathEditor.java | 4 +- .../roots/ui/configuration/ClasspathPanel.java | 44 +++++++++++----------- .../ui/configuration/JavaContentEntriesEditor.java | 2 +- .../openapi/roots/AnnotationOrderRootType.java | 2 +- .../com/intellij/openapi/roots/OrderRootType.java | 18 ++++++--- .../openapi/roots/PersistentOrderRootType.java | 5 +-- .../openapi/roots/impl/LibraryOrderEntryImpl.java | 21 +++-------- .../roots/impl/ModuleJdkOrderEntryImpl.java | 16 ++------ .../openapi/roots/impl/libraries/LibraryImpl.java | 2 +- .../vfs/impl/VirtualFilePointerContainerImpl.java | 2 +- .../src/com/intellij/util/EventDispatcher.java | 3 +- 11 files changed, 51 insertions(+), 68 deletions(-) diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java index 237fbcd40c..8fcd543b41 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java @@ -213,11 +213,11 @@ public class ClasspathEditor extends ModuleElementsEditor implements ModuleRootL return ClasspathStorage.getStorageType(getModel().getModule()); } - boolean isModified () { + boolean isModified() { return cbClasspathFormat != null && !getSelectedClasspathFormat().equals(getModuleClasspathFormat()); } - void apply () throws ConfigurationException { + void apply() throws ConfigurationException { final String storageID = getSelectedClasspathFormat(); ClasspathStorage.getProvider(storageID).assertCompatible(getModel()); ClasspathStorage.setStorageType(getModel(), storageID); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java index 447e1d08e0..a6fe96046c 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathPanel.java @@ -24,7 +24,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.StdModuleTypes; -import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.*; @@ -83,7 +82,7 @@ public class ClasspathPanel extends JPanel { private PopupAction[] myPopupActions = null; private Icon[] myIcons = null; private JButton myEditButton; - private ModuleConfigurationState myState; + private final ModuleConfigurationState myState; protected ClasspathPanel(ModuleConfigurationState state) { super(new BorderLayout()); @@ -322,7 +321,7 @@ public class ClasspathPanel extends JPanel { removeButton.addActionListener(new ButtonAction() { protected void executeImpl() { final List removedRows = TableUtil.removeSelectedItems(myEntryTable); - if (removedRows.size() == 0) { + if (removedRows.isEmpty()) { return; } for (final Object removedRow : removedRows) { @@ -475,13 +474,12 @@ public class ClasspathPanel extends JPanel { return; } try { - final List chosen; dialog.doChoose(); if (!dialog.isOK()) { return; } - chosen = dialog.getChosenElements(); - if (chosen.size() == 0) { + final List chosen = dialog.getChosenElements(); + if (chosen.isEmpty()) { return; } final ModuleStructureConfigurable rootConfigurable = ModuleStructureConfigurable.getInstance(myState.getProject()); @@ -512,7 +510,8 @@ public class ClasspathPanel extends JPanel { @Nullable protected abstract TableItem createTableItem(final ItemType item); - protected abstract @Nullable ChooserDialog createChooserDialog(); + @Nullable + protected abstract ChooserDialog createChooserDialog(); } private void initPopupActions() { @@ -572,7 +571,7 @@ public class ClasspathPanel extends JPanel { } protected ChooserDialog createChooserDialog() { final List chooseItems = getDependencyModules(); - if (chooseItems.size() == 0) { + if (chooseItems.isEmpty()) { Messages.showMessageDialog(ClasspathPanel.this, ProjectBundle.message("message.no.module.dependency.candidates"), getTitle(), Messages.getInformationIcon()); return null; } @@ -615,7 +614,8 @@ public class ClasspathPanel extends JPanel { myEntryTable.getCellEditor().stopCellEditing(); } final ListSelectionModel selectionModel = myEntryTable.getSelectionModel(); - for(int row = increment < 0? 0 : myModel.getRowCount() - 1; increment < 0? row < myModel.getRowCount() : row >= 0; row += (increment < 0? +1 : -1)){ + for(int row = increment < 0? 0 : myModel.getRowCount() - 1; increment < 0? row < myModel.getRowCount() : row >= 0; row += + increment < 0? +1 : -1){ if (selectionModel.isSelectedIndex(row)) { final int newRow = moveRow(row, increment); selectionModel.removeSelectionInterval(row, row); @@ -703,8 +703,8 @@ public class ClasspathPanel extends JPanel { } - private static abstract class TableItem { - protected @Nullable T myEntry; + private abstract static class TableItem { + @Nullable protected final T myEntry; protected TableItem(@Nullable T entry) { myEntry = entry; @@ -715,12 +715,12 @@ public class ClasspathPanel extends JPanel { } public final boolean isExported() { - return isExportable() && myEntry != null && ((ExportableOrderEntry)myEntry).isExported(); + return isExportable() && ((ExportableOrderEntry)getEntry()).isExported(); } public final void setExported(boolean isExported) { - if (isExportable() && myEntry != null) { - ((ExportableOrderEntry)myEntry).setExported(isExported); + if (isExportable()) { + ((ExportableOrderEntry)getEntry()).setExported(isExported); } } @@ -735,7 +735,7 @@ public class ClasspathPanel extends JPanel { } } - public final @Nullable T getEntry() { + public final T getEntry() { return myEntry; } @@ -807,7 +807,7 @@ public class ClasspathPanel extends JPanel { public static final int ITEM_COLUMN = 1; public static final int SCOPE_COLUMN = 2; private final List myItems = new ArrayList(); - private ModuleConfigurationState myState; + private final ModuleConfigurationState myState; public MyTableModel(final ModuleConfigurationState state) { myState = state; @@ -834,16 +834,16 @@ public class ClasspathPanel extends JPanel { private void addOrderEntry(OrderEntry orderEntry) { if (orderEntry instanceof JdkOrderEntry) { - addItem(new JdkItem(((JdkOrderEntry)orderEntry))); + addItem(new JdkItem((JdkOrderEntry)orderEntry)); } else if (orderEntry instanceof LibraryOrderEntry) { - addItem(new LibItem(((LibraryOrderEntry)orderEntry))); + addItem(new LibItem((LibraryOrderEntry)orderEntry)); } else if (orderEntry instanceof ModuleOrderEntry) { - addItem(new ModuleItem(((ModuleOrderEntry)orderEntry))); + addItem(new ModuleItem((ModuleOrderEntry)orderEntry)); } else if (orderEntry instanceof ModuleSourceOrderEntry) { - addItem(new SelfModuleItem(((ModuleSourceOrderEntry)orderEntry))); + addItem(new SelfModuleItem((ModuleSourceOrderEntry)orderEntry)); } } @@ -1054,7 +1054,7 @@ public class ClasspathPanel extends JPanel { private static class ChooseModuleLibrariesDialog extends LibraryFileChooser implements ChooserDialog { private Pair myLastChosen; private final LibraryTable myLibraryTable; - private final @Nullable VirtualFile myFileToSelect; + @Nullable private final VirtualFile myFileToSelect; public ChooseModuleLibrariesDialog(Component parent, final LibraryTable libraryTable, final VirtualFile fileToSelect) { super(createFileChooserDescriptor(parent), parent, false, null); @@ -1166,8 +1166,6 @@ public class ClasspathPanel extends JPanel { public List getChosenElements() { final List chosen = new ArrayList(Arrays.asList(myEditor.getSelectedLibraries())); chosen.removeAll(getAlreadyAddedLibraries()); - final Module module = getRootModel().getModule(); - final Project project = module.getProject(); return chosen; } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentEntriesEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentEntriesEditor.java index 127cf945ee..8ba4b21209 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentEntriesEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentEntriesEditor.java @@ -60,7 +60,7 @@ public class JavaContentEntriesEditor extends CommonContentEntriesEditor { @Override protected List addContentEntries(VirtualFile[] files) { List contentEntries = super.addContentEntries(files); - if (contentEntries.size() > 0) { + if (!contentEntries.isEmpty()) { final ContentEntry[] contentEntriesArray = contentEntries.toArray(new ContentEntry[contentEntries.size()]); addSourceRoots(myProject, contentEntriesArray, new Runnable() { public void run() { diff --git a/java/openapi/src/com/intellij/openapi/roots/AnnotationOrderRootType.java b/java/openapi/src/com/intellij/openapi/roots/AnnotationOrderRootType.java index 8aac1d4c76..9d8e7bc172 100644 --- a/java/openapi/src/com/intellij/openapi/roots/AnnotationOrderRootType.java +++ b/java/openapi/src/com/intellij/openapi/roots/AnnotationOrderRootType.java @@ -27,7 +27,7 @@ import java.util.List; */ public class AnnotationOrderRootType extends PersistentOrderRootType { /** - * External annotations path + * @return External annotations path */ public static OrderRootType getInstance() { return getOrderRootType(AnnotationOrderRootType.class); diff --git a/platform/lang-api/src/com/intellij/openapi/roots/OrderRootType.java b/platform/lang-api/src/com/intellij/openapi/roots/OrderRootType.java index 72f545b897..60cc400a87 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/OrderRootType.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/OrderRootType.java @@ -19,10 +19,7 @@ import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.Extensions; import org.jetbrains.annotations.NonNls; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; +import java.util.*; /** * Root types that can be queried from OrderEntry. @@ -111,13 +108,22 @@ public class OrderRootType { } protected static T getOrderRootType(final Class orderRootTypeClass) { - for(OrderRootType rootType: Extensions.getExtensions(EP_NAME)) { + OrderRootType[] rootTypes = Extensions.getExtensions(EP_NAME); + for(OrderRootType rootType: rootTypes) { if (orderRootTypeClass.isInstance(rootType)) { //noinspection unchecked return (T)rootType; } } - assert false; + assert false : "Root type "+orderRootTypeClass+" not found. All roots: "+ Arrays.asList(rootTypes); return null; } + + public final int hashCode() { + return super.hashCode(); + } + + public final boolean equals(Object obj) { + return super.equals(obj); + } } diff --git a/platform/lang-api/src/com/intellij/openapi/roots/PersistentOrderRootType.java b/platform/lang-api/src/com/intellij/openapi/roots/PersistentOrderRootType.java index fe49cd0c69..b799e76ad3 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/PersistentOrderRootType.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/PersistentOrderRootType.java @@ -37,7 +37,7 @@ public class PersistentOrderRootType extends OrderRootType { } /** - * Element name used for storing roots of this type in JDK and library definitions. + * @return Element name used for storing roots of this type in JDK and library definitions. */ public String getSdkRootName() { return mySdkRootName; @@ -48,10 +48,9 @@ public class PersistentOrderRootType extends OrderRootType { } /** - * Element name used for storing roots of this type in module definitions. + * @return Element name used for storing roots of this type in module definitions. */ public String getModulePathsName() { return myModulePathsName; } - } diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryImpl.java index 91999ebe97..47f6bee10d 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/LibraryOrderEntryImpl.java @@ -68,7 +68,7 @@ class LibraryOrderEntryImpl extends LibraryOrderEntryBaseImpl implements Library String name = element.getAttributeValue(NAME_ATTR); if (name == null) throw new InvalidDataException(); if (level == null) throw new InvalidDataException(); - searchForLibrary(level, name); + searchForLibrary(name, level); init(getRootProvider()); addListeners(); } @@ -97,12 +97,12 @@ class LibraryOrderEntryImpl extends LibraryOrderEntryBaseImpl implements Library ProjectRootManagerImpl projectRootManager, VirtualFilePointerManager filePointerManager) { super(rootModel, projectRootManager, filePointerManager); - searchForLibrary(level, name); + searchForLibrary(name, level); init(getRootProvider()); addListeners(); } - private void searchForLibrary(@NotNull String level, @NotNull String name) { + private void searchForLibrary(@NotNull String name, @NotNull String level) { if (myLibrary != null) return; final LibraryTable libraryTable = LibraryTablesRegistrar.getInstance().getLibraryTableByLevel(level, getRootModel().getModule().getProject()); final Library library = libraryTable != null ? libraryTable.getLibraryByName(name) : null; @@ -158,12 +158,8 @@ class LibraryOrderEntryImpl extends LibraryOrderEntryBaseImpl implements Library } @Nullable - private RootProvider getRootProvider() { - if (myLibrary != null) { - return myLibrary.getRootProvider(); - } else { - return null; - } + protected RootProvider getRootProvider() { + return myLibrary == null ? null : myLibrary.getRootProvider(); } public boolean isValid() { @@ -203,12 +199,7 @@ class LibraryOrderEntryImpl extends LibraryOrderEntryBaseImpl implements Library } public String getLibraryName() { - if (myLibrary != null) { - return myLibrary.getName(); - } - else { - return myLibraryName; - } + return myLibrary == null ? myLibraryName : myLibrary.getName(); } private void addListeners () { diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleJdkOrderEntryImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleJdkOrderEntryImpl.java index b6315ffcef..64da6ea3ac 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleJdkOrderEntryImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleJdkOrderEntryImpl.java @@ -116,13 +116,8 @@ public class ModuleJdkOrderEntryImpl extends LibraryOrderEntryBaseImpl implement myProjectRootManagerImpl.addJdkTableListener(this); } - private RootProvider getRootProvider() { - if (myJdk != null) { - return myJdk.getRootProvider(); - } - else { - return null; - } + protected RootProvider getRootProvider() { + return myJdk == null ? null : myJdk.getRootProvider(); } public Sdk getJdk() { @@ -144,12 +139,7 @@ public class ModuleJdkOrderEntryImpl extends LibraryOrderEntryBaseImpl implement public String getPresentableName() { - if (myJdk != null) { - return "< " + myJdk.getName() + " >"; - } - else { - return "< " + getJdkName() + " >"; - } + return "< " + (myJdk == null ? getJdkName() : myJdk.getName())+ " >"; } public boolean isValid() { diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryImpl.java index 1bc8d9765f..cc56b5f5d0 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/libraries/LibraryImpl.java @@ -405,7 +405,7 @@ public class LibraryImpl implements LibraryEx.ModifiableModelEx, LibraryEx { Disposer.dispose(this); } - private void commit(LibraryImpl fromModel) { + private void commit(@NotNull LibraryImpl fromModel) { if (myLibraryTable != null) { ApplicationManager.getApplication().assertWriteAccessAllowed(); } diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java index e516be41d7..fe92039d32 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/VirtualFilePointerContainerImpl.java @@ -182,7 +182,7 @@ public class VirtualFilePointerContainerImpl implements VirtualFilePointerContai result.add(file); } } - return result.toArray(new VirtualFile[result.size()]); + return result.isEmpty() ? VirtualFile.EMPTY_ARRAY : result.toArray(new VirtualFile[result.size()]); } @NotNull diff --git a/platform/util/src/com/intellij/util/EventDispatcher.java b/platform/util/src/com/intellij/util/EventDispatcher.java index 26dcda5c92..a09e67dea2 100644 --- a/platform/util/src/com/intellij/util/EventDispatcher.java +++ b/platform/util/src/com/intellij/util/EventDispatcher.java @@ -26,7 +26,6 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; import java.util.EventListener; import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; /** * @author max @@ -36,7 +35,7 @@ public class EventDispatcher { private final T myMulticaster; - private final CopyOnWriteArrayList myListeners = ContainerUtil.createEmptyCOWList(); + private final List myListeners = ContainerUtil.createEmptyCOWList(); public static EventDispatcher create(Class listenerClass) { return new EventDispatcher(listenerClass); -- 2.11.4.GIT