From db26610ac70f8ffeff8073225f928555c23e4ed4 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Sun, 11 Oct 2009 21:16:18 +0400 Subject: [PATCH] update copyright --- .../ant/src/com/intellij/lang/ant/AntBundle.java | 2 +- .../lang/ant/AntDeclarationRangeHandler.java | 15 ++++ .../intellij/lang/ant/AntDefaultNSProvider.java | 15 ++++ .../src/com/intellij/lang/ant/AntElementRole.java | 2 +- .../ant/src/com/intellij/lang/ant/AntFileType.java | 15 ++++ ...lement.java => AntHighlightRangeExtension.java} | 16 ++-- .../lang/ant/AntInspectionToolProvider.java | 15 ++++ .../ant/{PsiAntElement.java => AntLanguage.java} | 18 ++-- .../intellij/lang/ant/AntLanguageExtension.java | 15 ++++ .../{PsiAntElement.java => AntNamesValidator.java} | 25 ++++-- .../com/intellij/lang/ant/AntParserDefinition.java | 15 ++++ .../lang/ant/AntPropertyRefSelectioner.java | 15 ++++ .../lang/ant/AntStructureViewBuilderFactory.java | 16 ++++ .../ant/src/com/intellij/lang/ant/AntSupport.java | 15 ++++ .../intellij/lang/ant/ForcedAntFileAttribute.java | 15 ++++ .../lang/ant/{PsiAntElement.java => HelpID.java} | 12 +-- .../src/com/intellij/lang/ant/PsiAntElement.java | 2 +- .../com/intellij/lang/ant/config/AntBuildFile.java | 2 +- .../intellij/lang/ant/config/AntBuildFileBase.java | 15 ++++ .../intellij/lang/ant/config/AntBuildListener.java | 2 +- .../intellij/lang/ant/config/AntBuildModel.java | 2 +- .../{AntBuildModel.java => AntBuildModelBase.java} | 23 +++-- .../intellij/lang/ant/config/AntBuildTarget.java | 2 +- .../lang/ant/config/AntBuildTargetBase.java | 15 ++++ .../intellij/lang/ant/config/AntConfiguration.java | 2 +- .../lang/ant/config/AntConfigurationBase.java | 15 ++++ .../lang/ant/config/AntConfigurationListener.java | 2 +- .../lang/ant/config/AntNoFileException.java | 2 +- ...AntNoFileException.java => ExecutionEvent.java} | 21 ++--- .../lang/ant/config/actions/AddAntBuildFile.java | 15 ++++ .../actions/AntBuildFilePropertiesAction.java | 15 ++++ .../lang/ant/config/actions/AntBuildGroup.java | 15 ++++ .../lang/ant/config/actions/ChangeViewAction.java | 15 ++++ .../lang/ant/config/actions/PauseOutputAction.java | 15 ++++ .../ant/config/actions/RemoveBuildFileAction.java | 15 ++++ .../lang/ant/config/actions/RunAction.java | 15 ++++ .../lang/ant/config/actions/StopAction.java | 15 ++++ .../lang/ant/config/actions/TargetAction.java | 15 ++++ .../lang/ant/config/actions/TargetActionStub.java | 14 ++- .../lang/ant/config/actions/VerboseAction.java | 15 ++++ .../ant/config/execution/AntBuildMessageView.java | 15 ++++ .../config/execution/AntCommandLineBuilder.java | 15 ++++ .../lang/ant/config/execution/AntMessage.java | 15 ++++ .../lang/ant/config/execution/AntOutputView.java | 15 ++++ .../ant/config/execution/ExecutionHandler.java | 15 ++++ .../lang/ant/config/execution/HyperlinkUtil.java | 15 ++++ .../ant/config/execution/InputRequestHandler.java | 15 ++++ .../lang/ant/config/execution/MessageNode.java | 15 ++++ .../ant/config/execution/MessageTreeRenderer.java | 15 ++++ .../lang/ant/config/execution/OutputParser.java | 15 ++++ .../lang/ant/config/execution/OutputParser2.java | 15 ++++ .../lang/ant/config/execution/PathUtilEx.java | 15 ++++ .../lang/ant/config/execution/PlainTextView.java | 15 ++++ .../RunCanceledException.java} | 23 +++-- .../lang/ant/config/execution/TreeView.java | 15 ++++ .../explorer/AntBuildFileNodeDescriptor.java | 15 ++++ .../lang/ant/config/explorer/AntExplorer.java | 15 ++++ .../config/explorer/AntExplorerTreeBuilder.java | 15 ++++ .../config/explorer/AntExplorerTreeStructure.java | 15 ++++ .../ant/config/explorer/AntNodeDescriptor.java | 15 ++++ .../config/explorer/AntTargetNodeDescriptor.java | 15 ++++ .../ant/config/explorer/ExecuteOnRunDialog.java | 15 ++++ .../ant/config/explorer/SaveMetaTargetDialog.java | 15 ++++ .../lang/ant/config/impl/AllJarsUnderDirEntry.java | 15 ++++ .../impl/AntArtifactPostprocessingProperties.java | 15 ++++ .../AntArtifactPostprocessingPropertiesEditor.java | 15 ++++ ...ntArtifactPostprocessingPropertiesProvider.java | 15 ++++ .../lang/ant/config/impl/AntBeforeRunTask.java | 15 ++++ .../ant/config/impl/AntBeforeRunTaskProvider.java | 15 ++++ .../config/impl/AntBreadcrumbsInfoProvider.java | 15 +++- .../config/impl/AntBuildFileClassLoaderHolder.java | 15 ++++ .../lang/ant/config/impl/AntBuildFileImpl.java | 15 ++++ .../lang/ant/config/impl/AntBuildModelImpl.java | 15 ++++ .../lang/ant/config/impl/AntBuildTargetImpl.java | 15 ++++ .../lang/ant/config/impl/AntClasspathEntry.java | 15 ++++ .../lang/ant/config/impl/AntConfigurationImpl.java | 15 ++++ .../lang/ant/config/impl/AntInstallation.java | 15 ++++ .../impl/AntInstallationClassLoaderHolder.java | 15 ++++ .../lang/ant/config/impl/AntKeymapExtension.java | 15 ++++ .../lang/ant/config/impl/AntProjectComponent.java | 14 ++- .../lang/ant/config/impl/AntReference.java | 15 ++++ .../ant/config/impl/AntResourcesClassLoader.java | 15 ++++ .../ant/config/impl/AntToolwindowRegistrar.java | 15 +++- .../ant/config/impl/AntWorkspaceConfiguration.java | 15 ++++ .../lang/ant/config/impl/BuildFileProperty.java | 15 ++++ .../intellij/lang/ant/config/impl/BuildTask.java | 15 ++++ .../lang/ant/config/impl/ClassLoaderHolder.java | 15 +++- .../config/impl/CompositePropertyContainer.java | 15 ++++ .../config/impl/ExecuteAfterCompilationEvent.java | 15 ++++ .../config/impl/ExecuteBeforeCompilationEvent.java | 15 ++++ .../config/impl/ExecuteCompositeTargetEvent.java | 15 ++++ .../ant/config/impl/GlobalAntConfiguration.java | 15 ++++ .../impl/HelpID.java} | 14 ++- .../intellij/lang/ant/config/impl/MetaTarget.java | 15 ++++ .../lang/ant/config/impl/SinglePathEntry.java | 15 ++++ .../lang/ant/config/impl/TargetChooserDialog.java | 14 ++- .../lang/ant/config/impl/TargetFilter.java | 15 ++++ .../ant/config/impl/WrongNameFormatException.java} | 17 ++-- .../impl/configuration/AnActionListEditor.java | 15 ++++ .../configuration/AntClasspathEditorPanel.java | 15 ++++ .../ant/config/impl/configuration/AntSetPanel.java | 15 ++++ .../ant/config/impl/configuration/AntUIUtil.java | 15 ++++ .../configuration/BuildFilePropertiesPanel.java | 15 ++++ .../ChooseAndEditComboBoxController.java | 15 ++++ .../impl/configuration/EditPropertyContainer.java | 15 ++++ .../impl/configuration/ReorderableListToolbar.java | 15 ++++ .../impl/configuration/RunWithAntBinding.java | 15 ++++ .../impl/configuration/UIPropertyBinding.java | 15 ++++ .../lang/ant/doc/AntDocumentationProvider.java | 15 ++++ .../src/com/intellij/lang/ant/misc/AntPsiUtil.java | 15 ++++ .../AntStringInterner.java} | 20 ++--- .../lang/ant/misc/PsiElementSetSpinAllocator.java | 15 ++++ .../misc/PsiElementWithValueSetSpinAllocator.java | 15 ++++ .../ant/misc/PsiReferenceListSpinAllocator.java | 15 ++++ .../AntAllTasksContainer.java} | 13 ++- .../ant/{PsiAntElement.java => psi/AntAnt.java} | 17 ++-- .../ant/{PsiAntElement.java => psi/AntCall.java} | 20 +++-- .../{PsiAntElement.java => psi/AntComment.java} | 13 +-- .../{PsiAntElement.java => psi/AntDefTask.java} | 14 ++- .../src/com/intellij/lang/ant/psi/AntElement.java | 15 ++++ .../intellij/lang/ant/psi/AntElementVisitor.java | 15 +++- .../ant/src/com/intellij/lang/ant/psi/AntFile.java | 15 ++++ .../AntFilesProvider.java} | 20 +++-- .../ant/{PsiAntElement.java => psi/AntImport.java} | 19 ++-- .../{PsiAntElement.java => psi/AntMacroDef.java} | 14 ++- .../AntNameIdentifier.java} | 17 ++-- .../{PsiAntElement.java => psi/AntPresetDef.java} | 14 ++- .../src/com/intellij/lang/ant/psi/AntProject.java | 15 ++++ .../src/com/intellij/lang/ant/psi/AntProperty.java | 15 ++++ .../{PsiAntElement.java => psi/AntScriptDef.java} | 16 ++-- .../lang/ant/psi/AntStructuredElement.java | 15 ++++ .../src/com/intellij/lang/ant/psi/AntTarget.java | 15 ++++ .../ant/{PsiAntElement.java => psi/AntTask.java} | 15 ++-- .../src/com/intellij/lang/ant/psi/AntTypeDef.java | 15 ++++ .../lang/ant/psi/changes/AntChangeVisitor.java | 15 ++++ .../ant/psi/impl/AntAllTasksContainerImpl.java | 15 ++++ .../com/intellij/lang/ant/psi/impl/AntAntImpl.java | 15 ++++ .../lang/ant/psi/impl/AntBuildNumberImpl.java | 15 ++++ .../intellij/lang/ant/psi/impl/AntCallImpl.java | 15 ++++ .../intellij/lang/ant/psi/impl/AntCommentImpl.java | 15 ++++ .../intellij/lang/ant/psi/impl/AntDirSetImpl.java | 15 +++- .../lang/ant/psi/impl/AntElementFactory.java | 15 ++++ .../intellij/lang/ant/psi/impl/AntElementImpl.java | 15 ++++ .../lang/ant/psi/impl/AntEntityRefImpl.java | 15 ++++ .../intellij/lang/ant/psi/impl/AntFileImpl.java | 15 ++++ .../lang/ant/psi/impl/AntFileListImpl.java | 15 +++- .../intellij/lang/ant/psi/impl/AntFileSetImpl.java | 15 +++- .../lang/ant/psi/impl/AntFilesProviderImpl.java | 15 +++- .../intellij/lang/ant/psi/impl/AntImportImpl.java | 15 ++++ .../lang/ant/psi/impl/AntImportsIndex.java | 15 ++++ .../lang/ant/psi/impl/AntIntrospector.java | 15 +++- .../lang/ant/psi/impl/AntMacroDefImpl.java | 15 ++++ .../lang/ant/psi/impl/AntNameIdentifierImpl.java | 15 ++++ .../lang/ant/psi/impl/AntOuterProjectElement.java | 15 ++++ .../intellij/lang/ant/psi/impl/AntPathImpl.java | 15 +++- .../com/intellij/lang/ant/psi/impl/AntPattern.java | 15 +++- .../lang/ant/psi/impl/AntPresetDefImpl.java | 15 ++++ .../intellij/lang/ant/psi/impl/AntProjectImpl.java | 15 ++++ .../lang/ant/psi/impl/AntPropertyImpl.java | 15 ++++ .../lang/ant/psi/impl/AntScriptDefImpl.java | 15 ++++ .../ant/psi/impl/AntStructuredElementImpl.java | 15 ++++ .../intellij/lang/ant/psi/impl/AntTargetImpl.java | 15 ++++ .../intellij/lang/ant/psi/impl/AntTaskImpl.java | 15 ++++ .../lang/ant/psi/impl/AntTimestampFormatImpl.java | 15 +++- .../intellij/lang/ant/psi/impl/AntTypeDefImpl.java | 15 ++++ .../lang/ant/psi/impl/PropertiesBuilder.java | 15 +++- .../psi/impl/reference/AntAttributeReference.java | 15 ++++ .../reference/AntElementCompletionWrapper.java | 15 ++++ .../impl/reference/AntElementNameReference.java | 15 ++++ .../impl/reference/AntEndElementNameReference.java | 15 ++++ .../ant/psi/impl/reference/AntEntityReference.java | 15 ++++ .../ant/psi/impl/reference/AntFileReference.java | 15 ++++ .../psi/impl/reference/AntFileReferenceSet.java | 15 ++++ .../psi/impl/reference/AntGenericReference.java | 15 ++++ .../reference/AntMacroDefParameterReference.java | 15 ++++ .../psi/impl/reference/AntPropertyReference.java | 15 ++++ .../ant/psi/impl/reference/AntRefIdReference.java | 15 ++++ .../lang/ant/psi/impl/reference/AntReference.java} | 33 +++---- .../reference/AntReferenceProvidersRegistry.java | 15 ++++ .../ant/psi/impl/reference/AntTargetReference.java | 15 ++++ .../providers/AntAttributeReferenceProvider.java | 15 ++++ .../providers/AntElementNameReferenceProvider.java | 15 ++++ .../providers/AntFileReferenceProvider.java | 15 ++++ .../AntMacroDefParameterReferenceProvider.java | 15 ++++ .../providers/AntPropertyReferenceProvider.java | 15 ++++ .../providers/AntRefIdReferenceProvider.java | 15 ++++ .../AntSingleTargetReferenceProvider.java | 15 ++++ .../providers/AntTargetListReferenceProvider.java | 15 ++++ .../ant/psi/introspection/AntAttributeType.java | 15 ++++ .../ant/psi/introspection/AntTypeDefinition.java | 15 ++++ .../lang/ant/psi/introspection/AntTypeId.java | 15 ++++ .../introspection/impl/AntTypeDefinitionImpl.java | 15 ++++ .../lang/ant/psi/usages/AntUsagesProvider.java | 15 ++++ .../lang/ant/quickfix/AntChangeContextFix.java | 15 ++++ .../lang/ant/quickfix/AntCreateMacroDefFix.java | 15 ++++ .../lang/ant/quickfix/AntCreatePresetDefFix.java | 15 ++++ .../lang/ant/quickfix/AntCreatePropertyFix.java | 15 ++++ .../lang/ant/quickfix/AntCreateTargetFix.java | 15 ++++ .../lang/ant/refactoring/AntRenameHandler.java | 15 +++- .../AntTargetRenameListenerProvider.java | 15 ++++ .../AntVetoRenameCondition.java} | 16 ++-- .../lang/ant/resources/AntActionsBundle.java | 15 ++++ .../intellij/lang/ant/validation/AntAnnotator.java | 15 ++++ .../AntDuplicateImportedTargetsInspection.java | 15 ++++ .../validation/AntDuplicateTargetsInspection.java | 15 ++++ .../lang/ant/validation/AntHectorConfigurable.java | 15 ++++ .../ant/validation/AntHectorPanelProvider.java | 15 ++++ .../lang/ant/validation/AntInspection.java | 15 ++++ .../AntMissingPropertiesFileInspection.java | 15 ++++ .../com/intellij/lang/ant/AntCompletionTest.java | 15 ++++ .../com/intellij/lang/ant/AntHighlightingTest.java | 14 ++- .../lang/ant/AntMultiFileCompletionTest.java | 14 ++- .../src/com/intellij/lang/ant/AntParsingTest.java | 14 ++- .../src/com/intellij/lang/ant/AntRenameTest.java | 15 ++++ .../src/com/intellij/lang/ant/AntResolveTest.java | 15 ++++ .../src/com/intellij/lang/ant/CustomTypesTest.java | 15 ++++ .../intellij/lang/ant/psi/impl/PatternsTest.java | 15 +++- .../intellij/lang/ant/typedefs/AntCustomTask.java | 14 ++- .../ide/actions/CommanderViewActionGroup.java | 15 ++++ .../com/intellij/ide/actions/SwapPanelsAction.java | 15 ++++ .../com/intellij/ide/actions/SyncViewsAction.java | 15 ++++ .../src/com/intellij/ide/commander/Commander.java | 15 ++++ .../intellij/ide/commander/CommanderHistory.java | 15 +++- .../ide/commander/CommanderSelectInTarget.java | 15 ++++ .../ide/commander/CommanderToolWindowFactory.java} | 41 +++------ .../ide/commander/PsiDiffContentFactory.java | 15 ++++ .../maddyhome/idea/copyright/CopyrightManager.java | 18 ++-- .../maddyhome/idea/copyright/CopyrightProfile.java | 20 ++--- .../idea/copyright/CopyrightUpdaters.java} | 18 ++-- .../copyright/actions/AbstractFileProcessor.java | 20 ++--- .../copyright/actions/GenerateCopyrightAction.java | 20 ++--- .../idea/copyright/actions/RecursionDlg.java | 20 ++--- .../copyright/actions/UpdateCopyrightAction.java | 20 ++--- .../UpdateCopyrightCheckinHandlerFactory.java | 20 ++--- .../UpdateCopyrightCheckinHandlerState.java | 20 ++--- .../actions/UpdateCopyrightProcessor.java | 20 ++--- .../copyright/options/ExternalOptionHelper.java | 20 ++--- .../idea/copyright/options/JavaOptions.java} | 18 ++-- .../idea/copyright/options/LanguageOptions.java | 20 ++--- .../maddyhome/idea/copyright/options/Options.java | 20 ++--- .../idea/copyright/options/XmlOptions.java} | 15 ++-- .../maddyhome/idea/copyright/pattern/DateInfo.java | 20 ++--- .../idea/copyright/pattern/EntityUtil.java | 20 ++--- .../maddyhome/idea/copyright/pattern/FileInfo.java | 20 ++--- .../maddyhome/idea/copyright/pattern/FileUtil.java | 20 ++--- .../idea/copyright/pattern/ModuleInfo.java} | 26 ++++-- .../idea/copyright/pattern/ProjectInfo.java} | 26 ++++-- .../idea/copyright/pattern/VelocityHelper.java | 20 ++--- .../copyright/psi/AbstractUpdateCopyright.java | 20 ++--- .../idea/copyright/psi/UpdateCopyright.java} | 21 +++-- .../idea/copyright/psi/UpdateCopyrightFactory.java | 20 ++--- .../psi/UpdateCopyrightInstanceFactory.java} | 38 +++----- .../copyright/psi/UpdateJavaFileCopyright.java | 20 ++--- .../psi/UpdateJavaScriptFileCopyright.java | 20 ++--- .../idea/copyright/psi/UpdateJspFileCopyright.java | 20 ++--- .../copyright/psi/UpdateJspxFileCopyright.java | 20 ++--- .../psi/UpdatePropertiesFileCopyright.java | 20 ++--- .../idea/copyright/psi/UpdatePsiFileCopyright.java | 20 ++--- .../idea/copyright/psi/UpdateXmlFileCopyright.java | 20 ++--- .../idea/copyright/ui/CopyrightConfigurable.java | 20 ++--- .../ui/CopyrightFormattingConfigurable.java | 20 ++--- .../idea/copyright/ui/CopyrightProfilesPanel.java | 20 ++--- .../copyright/ui/CopyrightProjectConfigurable.java | 20 ++--- .../ui/FileTypeCopyrightConfigurableFactory.java | 20 ++--- .../idea/copyright/ui/IntegerTextField.java | 20 ++--- .../idea/copyright/ui/ProjectSettingsPanel.java | 20 ++--- .../idea/copyright/ui/TemplateCommentPanel.java | 20 ++--- .../ui/TemplateOptionsPanelListener.java} | 16 ++-- .../idea/copyright/util/FileTypeUtil.java | 20 ++--- .../idea/copyright/util/NewFileTracker.java | 20 ++--- .../cvs/cvs-core/src/com/intellij/CvsBundle.java | 7 +- .../src/com/intellij/cvsSupport2/Progress.java | 15 ++++ .../cvsSupport2/config/DateOrRevisionSettings.java | 15 ++++ .../cvsSupport2/config/ExtConfiguration.java | 15 ++++ .../intellij/cvsSupport2/config/LocalSettings.java | 15 ++++ .../intellij/cvsSupport2/config/ProxySettings.java | 15 ++++ .../intellij/cvsSupport2/config/SshSettings.java | 15 ++++ .../connections/ConnectionOnProcess.java | 15 ++++ .../connections/ConnectionSettingsImpl.java | 15 ++++ .../cvsSupport2/connections/CvsConnectionUtil.java | 14 ++- .../cvsSupport2/connections/CvsEnvironment.java | 15 ++++ .../cvsSupport2/connections/CvsMethod.java | 15 ++++ .../cvsSupport2/connections/CvsRootData.java | 15 ++++ .../cvsSupport2/connections/CvsRootParser.java | 15 ++++ .../connections/CvsRootSettingsBuilder.java} | 13 ++- .../connections/CvsSettings.java} | 16 ++-- .../cvsSupport2/connections/RootFormatter.java | 15 ++++ .../cvsSupport2/connections/ext/ExtConnection.java | 15 ++++ .../connections/local/LocalConnection.java | 15 ++++ .../connections/login/CvsLoginWorker.java} | 30 +++---- .../connections/ssh/ConnectionLifeCycle.java | 15 ++++ .../connections/ssh/ConnectionPoolI.java} | 23 ++--- .../cvsSupport2/connections/ssh/EmptyPool.java | 15 ++++ .../cvsSupport2/connections/ssh/LifeStages.java} | 17 ++-- .../connections/ssh/SSHPasswordProvider.java} | 19 ++-- .../ssh/SmPublicKeyAuthentification.java} | 14 ++- .../connections/ssh/SocksAuthenticatorManager.java | 15 ++++ .../connections/ssh/SocksProxyData.java | 15 ++++ .../ssh/SolveableAuthenticationException.java} | 26 +++--- .../connections/ssh/SshAuthentication.java} | 26 ++---- .../connections/ssh/SshConnectionPool.java | 15 ++++ .../connections/ssh/SshConnectionUtils.java | 15 ++++ .../cvsSupport2/connections/ssh/SshLogger.java} | 20 ++--- .../connections/ssh/SshPasswordAuthentication.java | 15 ++++ .../connections/ssh/SshProxyFactory.java | 15 ++++ .../ssh/SshPublicKeyAuthentication.java | 15 ++++ .../connections/ssh/SshSessionConnection.java | 15 ++++ .../connections/ssh/SshSharedConnection.java | 15 ++++ .../cvsSupport2/connections/ssh/SshTypesToUse.java | 15 ++++ .../cvsExecution/ModalityContext.java} | 15 ++-- .../dateOrRevision/RevisionOrDate.java | 15 ++++ .../cvsSupport2/errorHandling/ErrorRegistry.java} | 13 ++- .../cvsSupport2/history/CvsRevisionNumber.java | 15 ++++ .../javacvsImpl/io/InputStreamWrapper.java | 15 ++++ .../cvsSupport2/javacvsImpl/io/ReadThread.java | 15 ++++ .../javacvsImpl/io/ReadWriteStatistics.java | 15 ++++ .../openapi/cvsIntegration/DateOrRevision.java | 2 +- .../com/intellij/cvsSupport2/Cvs2Configurable.java | 15 ++++ .../com/intellij/cvsSupport2/CvsActionPlaces.java} | 15 ++-- .../cvsSupport2/CvsCheckinHandlerFactory.java | 14 ++- .../com/intellij/cvsSupport2/CvsDiffProvider.java | 15 ++++ .../src/com/intellij/cvsSupport2/CvsResultEx.java | 15 ++++ .../intellij/cvsSupport2/CvsRevisionSelector.java | 15 ++++ .../cvsSupport2/CvsStandardOperationsProvider.java | 36 +++----- .../intellij/cvsSupport2/CvsStatusEnvironment.java | 15 ++++ .../intellij/cvsSupport2/CvsUpdateEnvironment.java | 36 +++----- .../src/com/intellij/cvsSupport2/CvsUtil.java | 15 ++++ .../src/com/intellij/cvsSupport2/CvsVcs2.java | 15 ++++ .../intellij/cvsSupport2/UpdateConfigurable.java | 36 +++----- .../cvsSupport2/actions/AbstractAction.java | 15 ++++ .../actions/AbstractActionFromEditGroup.java} | 24 +++-- .../cvsSupport2/actions/AbstractWatchAction.java | 15 ++++ .../actions/AbstractWatchOnOffAction.java | 15 ++++ .../actions/ActionOnSelectedElement.java | 15 ++++ .../actions/AddFileOrDirectoryAction.java | 15 ++++ .../intellij/cvsSupport2/actions/BranchAction.java | 15 ++++ .../actions/BrowseCvsRepositoryAction.java | 15 ++++ .../cvsSupport2/actions/CheckoutFileAction.java | 15 ++++ .../actions/ConfigureCvsRootsAction.java | 15 ++++ .../cvsSupport2/actions/CreateTagAction.java | 15 ++++ .../intellij/cvsSupport2/actions/Cvs2Group.java} | 24 ++--- .../cvsSupport2/actions/CvsGlobalAction.java | 15 ++++ .../cvsSupport2/actions/DeleteTagAction.java | 15 ++++ .../intellij/cvsSupport2/actions/EditAction.java | 15 ++++ .../actions/GetFileFromRepositoryAction.java | 15 ++++ .../cvsSupport2/actions/GlobalSettingsAction.java} | 16 ++-- .../cvsSupport2/actions/IgnoreFileAction.java | 15 ++++ .../intellij/cvsSupport2/actions/ImportAction.java | 15 ++++ .../actions/RemoveLocallyDeletedFilesAction.java | 15 ++++ .../RemoveLocallyFileOrDirectoryAction.java | 15 ++++ .../cvsSupport2/actions/RestoreFileAction.java | 15 ++++ .../cvsSupport2/actions/ToggleOfflineAction.java | 14 ++- .../intellij/cvsSupport2/actions/UneditAction.java | 15 ++++ .../cvsSupport2/actions/UnmarkAddedAction.java | 15 ++++ .../cvsSupport2/actions/ViewEditorsAction.java | 15 ++++ .../cvsSupport2/actions/ViewWatchersAction.java | 15 ++++ .../cvsSupport2/actions/WatchAddAction.java | 15 ++++ .../cvsSupport2/actions/WatchOffAction.java} | 25 +++--- .../cvsSupport2/actions/WatchOnAction.java} | 24 ++--- .../cvsSupport2/actions/WatchRemoveAction.java | 15 ++++ .../actionVisibility/CvsActionVisibility.java | 15 ++++ .../actions/cvsContext/CachedCvsContext.java | 15 ++++ .../cvsSupport2/actions/cvsContext/CvsContext.java | 15 ++++ .../actions/cvsContext/CvsContextAdapter.java | 15 ++++ .../actions/cvsContext/CvsContextWrapper.java | 15 ++++ .../actions/cvsContext/CvsDataConstants.java} | 19 ++-- .../actions/cvsContext/CvsLightweightFile.java | 15 ++++ .../actions/merge/CvsConflictsParser.java | 15 ++++ .../actions/merge/CvsMergeProvider.java | 2 +- .../cvsSupport2/actions/merge/MergeAction.java | 15 ++++ .../actions/merge/MergeDataProvider.java} | 35 +++----- .../cvsSupport2/actions/merge/MergeInfo.java | 15 ++++ .../update/UpdateByBranchUpdateSettings.java | 15 ++++ .../cvsSupport2/actions/update/UpdateSettings.java | 15 ++++ .../update/UpdateSettingsOnCvsConfiguration.java | 15 ++++ .../annotate/CvsAnnotationProvider.java | 36 +++----- .../cvsSupport2/annotate/CvsFileAnnotation.java | 36 +++----- .../cvsSupport2/application/AddHandler.java | 15 ++++ .../cvsSupport2/application/CvsEntriesManager.java | 15 ++++ .../application/CvsFileOperationsHandler.java | 15 ++++ .../intellij/cvsSupport2/application/CvsInfo.java | 15 ++++ .../application/CvsStorageComponent.java | 15 ++++ .../CvsStorageSupportingDeletionComponent.java | 15 ++++ .../cvsSupport2/application/DeleteHandler.java | 15 ++++ .../application/DeletedCVSDirectoryStorage.java | 15 ++++ .../changeBrowser/CvsBinaryContentRevision.java | 14 ++- .../cvsSupport2/changeBrowser/CvsChangeList.java | 14 ++- .../changeBrowser/CvsChangeListsBuilder.java | 15 ++++ .../changeBrowser/CvsCommittedChangesProvider.java | 14 ++- .../changeBrowser/CvsContentRevision.java | 14 ++- .../changeBrowser/CvsRepositoryLocation.java | 15 ++++ .../changeBrowser/CvsVersionFilterComponent.java | 15 ++++ .../changeBrowser/LoadHistoryOperation.java | 15 ++++ .../changeBrowser/LogInformationWrapper.java | 15 ++++ .../cvsSupport2/changeBrowser/RevisionWrapper.java | 15 ++++ .../checkinProject/AdditionalOptionsPanel.java | 15 ++++ .../checkinProject/CvsCheckinEnvironment.java | 15 ++++ .../cvsSupport2/checkinProject/CvsDiffColors.java} | 26 ++---- .../checkinProject/CvsRollbackEnvironment.java | 15 ++++ .../cvsSupport2/checkinProject/CvsRollbacker.java | 15 ++++ .../checkinProject/DirectoryContent.java | 15 ++++ .../checkinProject/VirtualFileEntry.java} | 36 ++++---- .../cvsSupport2/checkout/CheckoutAction.java | 15 ++++ .../cvsSupport2/checkout/CvsCheckoutProvider.java | 15 ++++ .../cvsSupport2/config/AbstractConfiguration.java | 15 ++++ .../config/CvsApplicationLevelConfiguration.java | 15 ++++ .../cvsSupport2/config/CvsConfiguration.java | 15 ++++ .../cvsSupport2/config/CvsRootConfiguration.java | 15 ++++ .../cvsSupport2/config/CvsRootEditor.java} | 14 +-- .../cvsSupport2/config/ImportConfiguration.java | 15 ++++ .../ui/ConfigureCvsGlobalSettingsDialog.java | 15 ++++ .../config/ui/Cvs2SettingsEditPanel.java | 15 ++++ .../config/ui/CvsConfigurationPanel.java | 15 ++++ .../config/ui/CvsConfigurationsListEditor.java | 15 ++++ .../cvsSupport2/config/ui/CvsListCellRenderer.java | 100 +++++++++------------ .../ui/CvsRootAsStringConfigurationPanel.java | 15 ++++ .../ui/CvsRootFieldByFieldConfigurationPanel.java | 15 ++++ .../config/ui/GlobalCvsSettingsPanel.java | 15 ++++ .../config/ui/SelectCvsConfgurationPanel.java | 15 ++++ .../config/ui/SelectCvsConfigurationDialog.java | 15 ++++ .../cvsSupport2/connections/ConnectionWrapper.java | 15 ++++ .../connections/CvsConnectionSettings.java | 15 ++++ .../connections/CvsRootDataBuilder.java | 14 ++- .../connections/CvsRootOnEnvironment.java | 15 ++++ .../connections/CvsRootOnFileSystem.java | 15 ++++ .../cvsSupport2/connections/CvsRootProvider.java | 15 ++++ .../cvsSupport2/connections/IDEARootFormatter.java | 14 ++- .../connections/SelfTestingConnection.java} | 14 +-- .../connections/SelfTestingConnectionWrapper.java | 15 ++++ .../connections/ext/ExtConnectionCvsSettings.java | 15 ++++ .../connections/ext/ExtLoginWorker.java | 15 ++++ .../connections/ext/ui/ExtConnectionDualPanel.java | 15 ++++ .../ext/ui/ExtConnectionSettingsPanel.java | 15 ++++ .../connections/local/LocalConnectionSettings.java | 15 ++++ .../local/ui/LocalConnectionSettingsPanel.java | 15 ++++ .../connections/login/CvsLoginWorkerImpl.java | 15 ++++ .../connections/pserver/PServerCvsSettings.java | 15 ++++ .../connections/pserver/PServerLoginProvider.java | 15 ++++ .../pserver/PServerLoginProviderImpl.java | 15 ++++ .../pserver/ui/PServerSettingsPanel.java | 15 ++++ .../connections/ssh/SSHPasswordProviderImpl.java | 15 ++++ .../connections/ssh/SshConnectionSettings.java | 36 +++----- .../connections/ssh/SshConnectionUtil.java | 15 ++++ .../ssh/ui/SshConnectionSettingsPanel.java | 15 ++++ .../connections/ssh/ui/SshPasswordDialog.java | 15 ++++ .../connections/ui/ProxySettingsPanel.java | 15 ++++ .../cvsBrowser/AbstractVcsDataProvider.java | 15 ++++ .../cvsSupport2/cvsBrowser/CheckoutHelper.java | 15 ++++ .../cvsSupport2/cvsBrowser/Cvs2Renderer.java | 15 ++++ .../cvsSupport2/cvsBrowser/CvsElement.java | 15 ++++ .../cvsSupport2/cvsBrowser/CvsElementFactory.java | 15 ++++ .../intellij/cvsSupport2/cvsBrowser/CvsFile.java | 15 ++++ .../cvsSupport2/cvsBrowser/CvsModule.java} | 22 +++-- .../intellij/cvsSupport2/cvsBrowser/CvsTree.java | 15 ++++ .../cvsSupport2/cvsBrowser/CvsTreeModel.java | 15 ++++ .../cvsBrowser/FolderDataProvider.java} | 21 ++--- .../cvsBrowser/GetContentCallback.java} | 23 +++-- .../cvsSupport2/cvsBrowser/LoadingNode.java | 2 +- .../cvsBrowser/LoginAbortedException.java} | 15 ++-- .../cvsSupport2/cvsBrowser/ModuleDataProvider.java | 15 ++++ .../cvsBrowser/RemoteResourceDataProvider.java} | 17 ++-- .../cvsSupport2/cvsBrowser/RootDataProvider.java | 15 ++++ .../cvsSupport2/cvsBrowser/ui/BrowserPanel.java | 15 ++++ .../cvsExecution/CvsOperationExecutor.java | 15 ++++ .../cvsExecution/CvsOperationExecutorCallback.java | 15 ++++ .../cvsExecution/ModalityContextImpl.java | 15 ++++ .../cvsSupport2/cvsIgnore/IgnoreFileFilter.java | 15 ++++ .../IgnoreFileFilterBasedOnCvsEntriesManager.java | 15 ++++ .../cvsSupport2/cvsIgnore/IgnoredFilesInfo.java} | 26 ++++-- .../cvsIgnore/IgnoredFilesInfoImpl.java | 15 ++++ .../cvsSupport2/cvsIgnore/UserDirIgnores.java | 15 ++++ .../cvshandlers/AbstractCvsHandler.java | 15 ++++ .../cvshandlers/AllFilesInProject.java} | 23 ++--- .../cvsSupport2/cvshandlers/AnyProcessedFiles.java | 15 ++++ .../cvsSupport2/cvshandlers/CheckoutHandler.java | 15 ++++ .../cvsSupport2/cvshandlers/CommandCvsHandler.java | 15 ++++ .../cvsSupport2/cvshandlers/CvsHandler.java | 15 ++++ .../cvsSupport2/cvshandlers/CvsMessagePattern.java | 15 ++++ .../cvshandlers/CvsMessagesConsole.java | 15 ++++ .../cvsSupport2/cvshandlers/CvsUpdatePolicy.java | 36 +++----- .../cvshandlers/FileSetToBeUpdated.java | 15 ++++ .../cvshandlers/IOFilesBasedDirectoryPruner.java | 15 ++++ .../cvsSupport2/cvshandlers/SelectedFiles.java | 15 ++++ .../cvsSupport2/cvshandlers/UpdateHandler.java | 15 ++++ .../cvsoperations/common/CompositeOperaton.java | 15 ++++ .../cvsoperations/common/CreateFileObjects.java | 15 ++++ .../cvsoperations/common/CvsCommandOperation.java | 36 +++----- .../common/CvsExecutionEnvironment.java | 15 ++++ .../cvsoperations/common/CvsOperation.java | 15 ++++ .../cvsoperations/common/CvsOperationOnFiles.java | 15 ++++ .../cvsoperations/common/FindAllRoots.java | 15 ++++ .../common/LocalPathIndifferentOperation.java | 15 ++++ .../LocalPathIndifferentOperationHelper.java | 15 ++++ .../cvsoperations/common/LoginPerformer.java | 15 ++++ .../cvsoperations/common/PostCvsActivity.java} | 34 +++---- .../common/ReceivedFileProcessor.java} | 26 +++--- .../common/RepositoryModificationOperation.java | 15 ++++ .../common/RepositoryPathProvider.java} | 13 ++- .../cvsoperations/common/UpdatedFilesManager.java | 15 ++++ .../cvsoperations/cvsAdd/AddFileOperation.java | 15 ++++ .../cvsoperations/cvsAdd/AddFilesOperation.java | 15 ++++ .../cvsoperations/cvsAdd/AddedFileInfo.java | 36 +++----- .../ui/AbstractAddFileConfirmationPanel.java | 15 ++++ .../cvsAdd/ui/AbstractAddOptionsDialog.java | 15 ++++ .../cvsAdd/ui/AddDirectoryConfirmationPanel.java | 15 ++++ .../cvsAdd/ui/AddFileConfirmationPanel.java | 15 ++++ .../cvsAdd/ui/AddMultiplyFilesOptionsDialog.java | 15 ++++ .../cvsAdd/ui/AddOneFileOptionsDialog.java | 15 ++++ .../cvsAdd/ui/AddedFileCellRenderer.java | 15 ++++ .../cvsAnnotate/AnnotateOperation.java | 15 ++++ .../cvsoperations/cvsAnnotate/Annotation.java | 15 ++++ .../cvsCheckOut/CheckoutAdminReader.java | 15 ++++ .../cvsCheckOut/CheckoutAdminWriter.java | 15 ++++ .../CheckoutFileByRevisionOperation.java} | 22 ++--- .../cvsCheckOut/CheckoutFileOperation.java | 15 ++++ .../cvsCheckOut/CheckoutFilesOperation.java | 15 ++++ .../cvsCheckOut/CheckoutProjectOperation.java | 15 ++++ .../cvsCheckOut/ui/CheckoutFileDialog.java | 15 ++++ .../cvsCheckOut/ui/FileCellRenderer.java | 92 ++++++++----------- .../cvsCommit/CommitFilesOperation.java | 15 ++++ .../cvsoperations/cvsContent/DirectoryContent.java | 15 ++++ .../cvsContent/DirectoryContentListener.java | 15 ++++ .../cvsContent/DirectoryContentProvider.java} | 14 +-- .../GetDirectoriesListViaUpdateOperation.java | 15 ++++ .../cvsContent/GetFileContentOperation.java | 15 ++++ .../cvsContent/GetModuleContentOperation.java | 15 ++++ .../cvsContent/GetModulesListOperation.java | 15 ++++ .../cvsoperations/cvsEdit/EditOperation.java | 15 ++++ .../cvsoperations/cvsEdit/EditorInfo.java | 15 ++++ .../cvsoperations/cvsEdit/EditorsOperation.java | 15 ++++ .../cvsoperations/cvsEdit/UneditOperation.java | 15 ++++ .../ui/EditCvsConfigurationFieldByFieldDialog.java | 15 ++++ .../cvsEdit/ui/EditOptionsDialog.java | 15 ++++ .../cvsoperations/cvsEdit/ui/EditorsPanel.java | 15 ++++ .../cvsErrors/ErrorMessagesProcessor.java | 15 ++++ .../cvsoperations/cvsErrors/ErrorProcessor.java} | 18 ++-- .../cvsoperations/cvsImport/ImportDetails.java | 15 ++++ .../cvsoperations/cvsImport/ImportOperation.java | 15 ++++ .../cvsLog/LocalPathIndifferentLogOperation.java | 15 ++++ .../cvsoperations/cvsLog/LogOperation.java | 15 ++++ .../cvsMessages/CvsCompositeListener.java | 15 ++++ .../cvsMessages/CvsListenerWithProgress.java | 15 ++++ .../cvsMessages/CvsListenersCollection.java} | 14 ++- .../cvsMessages/CvsMessagesAdapter.java | 15 ++++ .../cvsMessages/CvsMessagesListener.java | 15 ++++ .../cvsMessages/CvsMessagesTranslator.java | 15 ++++ .../cvsoperations/cvsMessages/FileMessage.java | 15 ++++ .../cvsoperations/cvsMessages/MessageEvent.java} | 41 +++++---- .../cvsRemove/RemoveFilesOperation.java | 15 ++++ .../cvsoperations/cvsStatus/StatusOperation.java | 15 ++++ .../cvsTagOrBranch/BranchOperation.java | 15 ++++ .../cvsTagOrBranch/BranchesProvider.java} | 17 ++-- .../cvsTagOrBranch/GetAllBranchesOperation.java | 15 ++++ .../cvsTagOrBranch/RTagOperation.java | 15 ++++ .../cvsoperations/cvsTagOrBranch/RtagCommand.java | 15 ++++ .../cvsoperations/cvsTagOrBranch/TagOperation.java | 15 ++++ .../cvsoperations/cvsTagOrBranch/TagsHelper.java | 15 ++++ .../cvsTagOrBranch/TagsProvider.java} | 16 ++-- .../cvsTagOrBranch/TagsProviderOnEnvironment.java} | 34 +++---- .../cvsTagOrBranch/TagsProviderOnVirtualFiles.java | 15 ++++ .../cvsTagOrBranch/ui/CreateTagDialog.java | 15 ++++ .../cvsTagOrBranch/ui/CvsTagDialog.java} | 26 +++--- .../cvsTagOrBranch/ui/DeleteTagDialog.java | 15 ++++ .../cvsTagOrBranch/ui/SelectTagDialog.java | 15 ++++ .../cvsTagOrBranch/ui/TagNameFieldOwner.java} | 18 ++-- .../cvsoperations/cvsTagOrBranch/ui/TagsPanel.java | 15 ++++ .../MergedWithConflictProjectOrModuleFile.java} | 29 +++--- .../cvsoperations/cvsUpdate/UpdateOperation.java | 15 ++++ .../cvsUpdate/UpdateReceivedFileProcessor.java | 15 ++++ .../cvsUpdate/ui/CorruptedProjectFilesDialog.java | 15 ++++ .../cvsUpdate/ui/UpdateOptionsPanel.java | 15 ++++ .../cvsoperations/cvsWatch/WatchOperation.java | 15 ++++ .../cvsoperations/cvsWatch/WatcherInfo.java | 15 ++++ .../cvsoperations/cvsWatch/WatchersOperation.java | 15 ++++ .../cvsoperations/cvsWatch/ui/WatcherDialog.java | 15 ++++ .../cvsoperations/cvsWatch/ui/WatchersPanel.java | 15 ++++ .../dateOrRevision/CommandWrapper.java | 15 ++++ .../dateOrRevision/RevisionOrDateImpl.java | 15 ++++ .../dateOrRevision/SimpleRevision.java | 15 ++++ .../ui/DateOrRevisionOrTagSettings.java | 15 ++++ .../AdminReaderForLightFiles.java | 15 ++++ .../javacvsSpecificImpls/AdminReaderOnCache.java | 15 ++++ .../AdminReaderOnStoredRepositoryPath.java | 15 ++++ .../javacvsSpecificImpls/AdminWriterOnCache.java | 15 ++++ .../AdminWriterStoringRepositoryPath.java | 15 ++++ .../ConstantLocalFileReader.java | 15 ++++ .../javacvsSpecificImpls/DeafAdminReader.java | 15 ++++ .../javacvsSpecificImpls/DeafAdminWriter.java | 15 ++++ .../cvsSupport2/cvsstatuses/CvsChangeProvider.java | 15 ++++ .../cvsstatuses/CvsEntriesListener.java} | 16 ++-- .../cvsSupport2/cvsstatuses/CvsStatusProvider.java | 15 ++++ .../errorHandling/CannotFindCvsRootException.java} | 19 ++-- .../cvsSupport2/errorHandling/CvsException.java | 15 ++++ .../errorHandling/CvsProcessException.java} | 15 ++-- .../InvalidModuleDescriptionException.java} | 21 ++--- .../history/ComparableVcsRevisionOnOperation.java | 15 ++++ .../cvsSupport2/history/CvsFileContent.java | 15 ++++ .../cvsSupport2/history/CvsFileRevision.java} | 21 +++-- .../cvsSupport2/history/CvsFileRevisionImpl.java | 15 ++++ .../cvsSupport2/history/CvsHistoryProvider.java | 15 ++++ .../intellij/cvsSupport2/impl/CvsServicesImpl.java | 15 ++++ .../intellij/cvsSupport2/impl/ModuleChooser.java | 15 ++++ .../javacvsImpl/CvsCommandStopper.java} | 26 +++--- .../javacvsImpl/FileReadOnlyHandler.java} | 37 +++----- .../javacvsImpl/ProjectContentInfoProvider.java} | 15 ++-- .../javacvsImpl/io/DeafLocalFileWriter.java | 15 ++++ .../javacvsImpl/io/LocalFileReaderBasedOnVFS.java | 15 ++++ .../javacvsImpl/io/OutputStreamWrapper.java | 15 ++++ .../io/ReceiveTextFilePreprocessor.java | 15 ++++ .../javacvsImpl/io/SendTextFilePreprocessor.java | 15 ++++ .../io/StoringLineSeparatorsLocalFileWriter.java | 15 ++++ .../cvsSupport2/javacvsImpl/io/StreamLogger.java | 15 ++++ .../KeywordSubstitutionListWithSelection.java | 15 ++++ .../KeywordSubstitutionWrapper.java | 15 ++++ .../cvsSupport2/ui/AbstractListCellRenderer.java | 15 ++++ .../ui/ChangeKeywordSubstitutionPanel.java | 15 ++++ .../cvsSupport2/ui/CvsRootChangeListener.java} | 13 ++- .../intellij/cvsSupport2/ui/CvsTabbedWindow.java | 15 ++++ .../cvsSupport2/ui/CvsTabbedWindowComponent.java | 15 ++++ .../ui/KeywordSubstitutionComboBoxWrapper.java | 15 ++++ .../src/com/intellij/cvsSupport2/ui/Options.java | 15 ++++ .../ui/RestoreDirectoriesConfirmationDialog.java | 15 ++++ .../cvsSupport2/ui/SelectFileVersionDialog.java | 15 ++++ .../intellij/cvsSupport2/ui/experts/CvsWizard.java | 15 ++++ .../ui/experts/SelectCVSConfigurationStep.java | 15 ++++ .../ui/experts/SelectCvsElementStep.java | 15 ++++ .../cvsSupport2/ui/experts/SelectLocationStep.java | 15 ++++ .../cvsSupport2/ui/experts/WizardStep.java | 15 ++++ .../ui/experts/checkout/CheckoutWizard.java | 15 ++++ .../ui/experts/checkout/ChooseCheckoutMode.java | 15 ++++ .../CustomizeKeywordSubstitutionStep.java | 15 ++++ .../ui/experts/importToCvs/CvsFieldValidator.java | 15 ++++ .../ui/experts/importToCvs/FileExtension.java | 15 ++++ .../ui/experts/importToCvs/ImportSettingsStep.java | 15 ++++ .../ui/experts/importToCvs/ImportTree.java | 15 ++++ .../ui/experts/importToCvs/ImportWizard.java | 15 ++++ .../importToCvs/SelectImportLocationStep.java | 15 ++++ .../updateinfo/UpdatedFilesProcessor.java | 36 +++----- .../com/intellij/cvsSupport2/util/CvsFileUtil.java | 15 ++++ .../com/intellij/cvsSupport2/util/CvsVfsUtil.java | 15 ++++ .../intellij/openapi/cvsIntegration/CvsModule.java | 2 +- .../openapi/cvsIntegration/CvsRepository.java | 2 +- .../intellij/openapi/cvsIntegration/CvsResult.java | 2 +- .../openapi/cvsIntegration/CvsServices.java | 2 +- .../cvsoperations/cvsLog/RlogCommand.java | 15 ++++ .../intellij/util/xml/PluginPsiClassConverter.java | 15 +++- plugins/devkit/src/DevKitBundle.java | 15 ++++ plugins/devkit/src/DevKitFileTemplatesFactory.java | 18 ++-- plugins/devkit/src/DevKitIconProvider.java | 15 +++- .../devkit/src/DevKitInspectionToolProvider.java | 18 ++-- .../GenerateClassAndPatchPluginXmlActionBase.java | 2 +- .../GenerateComponentExternalizationAction.java | 2 +- .../src/actions/GeneratePluginClassAction.java | 2 +- plugins/devkit/src/actions/NewActionAction.java | 2 +- plugins/devkit/src/actions/NewActionDialog.java | 2 +- .../src/actions/NewApplicationComponentAction.java | 2 +- .../src/actions/NewModuleComponentAction.java | 2 +- .../src/actions/NewProjectComponentAction.java | 2 +- .../devkit/src/build/PluginBuildConfiguration.java | 2 +- .../devkit/src/build/PluginBuildParticipant.java | 15 +++- .../src/build/PluginBuildParticipantProvider.java | 14 ++- plugins/devkit/src/build/PluginBuildUtil.java | 2 +- .../src/build/PluginModuleBuildConfEditor.java | 2 +- .../devkit/src/build/PrepareAllToDeployAction.java | 2 +- .../devkit/src/build/PrepareToDeployAction.java | 2 +- plugins/devkit/src/build/ant/BuildJarTarget.java | 14 ++- .../src/build/ant/ChunkBuildPluginExtension.java | 14 ++- .../src/build/ant/PluginBuildProperties.java | 14 ++- plugins/devkit/src/dom/Action.java | 16 ++++ .../src/{util/ActionData.java => dom/Actions.java} | 38 ++++---- plugins/devkit/src/dom/AddToGroup.java | 16 ++++ plugins/devkit/src/dom/ApplicationComponents.java | 16 ++++ plugins/devkit/src/dom/Component.java | 16 ++++ .../{util/ActionData.java => dom/Dependency.java} | 44 ++++----- .../src/dom/Extension.java} | 20 +++-- plugins/devkit/src/dom/ExtensionPoint.java | 15 ++++ .../src/dom/ExtensionPoints.java} | 20 +++-- plugins/devkit/src/dom/Extensions.java | 16 ++++ plugins/devkit/src/dom/Group.java | 16 ++++ plugins/devkit/src/dom/Helpset.java | 16 ++++ plugins/devkit/src/dom/IdeaPlugin.java | 16 ++++ .../{util/ActionData.java => dom/IdeaVersion.java} | 41 ++++----- plugins/devkit/src/dom/KeyboardShortcut.java | 16 ++++ plugins/devkit/src/dom/ModuleComponents.java | 16 ++++ plugins/devkit/src/dom/MouseShortcut.java | 16 ++++ plugins/devkit/src/dom/Option.java | 16 ++++ .../ActionData.java => dom/ProjectComponents.java} | 36 +++----- plugins/devkit/src/dom/Reference.java | 16 ++++ plugins/devkit/src/dom/Shortcut.java | 16 ++++ plugins/devkit/src/dom/Vendor.java | 16 ++++ .../devkit/src/dom/impl/ExtensionDomExtender.java | 15 ++++ .../devkit/src/dom/impl/ExtensionNsConverter.java | 15 ++++ .../devkit/src/dom/impl/IdeaPluginConverter.java | 15 ++++ .../src/dom/impl/IdeaPluginImpl.java} | 29 +++--- .../src/dom/impl/PluginXmlDomFileDescription.java | 15 ++++ .../ComponentNotRegisteredInspection.java | 2 +- .../inspections/DescriptionNotFoundInspection.java | 18 ++-- .../src/inspections/DevKitInspectionBase.java | 2 +- .../src/inspections/PluginXmlDomInspection.java | 15 ++++ .../RegistrationProblemsInspection.java | 2 +- .../inspections/quickfix/AbstractRegisterFix.java | 2 +- .../devkit/src/inspections/quickfix/BaseFix.java | 2 +- .../inspections/quickfix/CreateConstructorFix.java | 2 +- .../quickfix/CreateHtmlDescriptionFix.java | 18 ++-- .../inspections/quickfix/ImplementOrExtendFix.java | 2 +- .../src/inspections/quickfix/MakePublicFix.java | 2 +- .../inspections/quickfix/RegisterActionFix.java | 2 +- .../inspections/quickfix/RegisterComponentFix.java | 2 +- .../src/module/PluginDescriptorConstants.java | 2 +- plugins/devkit/src/module/PluginModuleBuilder.java | 2 +- .../src/module/PluginModuleEditorsProvider.java | 2 +- plugins/devkit/src/module/PluginModuleType.java | 2 +- plugins/devkit/src/projectRoots/IdeaJdk.java | 2 +- .../src/projectRoots/IdeaJdkConfigurable.java | 2 +- plugins/devkit/src/projectRoots/Sandbox.java | 2 +- plugins/devkit/src/run/IdeaLicenseHelper.java | 2 +- plugins/devkit/src/run/JUnitDevKitPatcher.java | 2 +- .../devkit/src/run/PluginConfigurationType.java | 2 +- plugins/devkit/src/run/PluginRunConfiguration.java | 2 +- .../src/run/PluginRunConfigurationEditor.java | 2 +- plugins/devkit/src/util/ActionData.java | 2 +- plugins/devkit/src/util/ActionType.java | 2 +- plugins/devkit/src/util/ChooseModulesDialog.java | 2 +- plugins/devkit/src/util/ComponentType.java | 2 +- plugins/devkit/src/util/DescriptorUtil.java | 2 +- plugins/devkit/src/util/PsiUtil.java | 18 ++-- .../devkit/testSources/build/GenerateAntTest.java | 14 ++- .../codeInsight/CreateClassFixTest.java | 16 ++++ .../codeInsight/PluginXmlFunctionalTest.java | 15 +++- .../src/org/jdom/output/EclipseJDOMUtil.java | 15 ++++ .../org/jetbrains/idea/eclipse/EclipseBundle.java | 15 ++++ .../src/org/jetbrains/idea/eclipse/EclipseXml.java | 15 ++++ .../src/org/jetbrains/idea/eclipse/IdeaXml.java | 15 ++++ .../idea/eclipse/config/CachedXmlDocumentSet.java | 15 ++++ .../config/EclipseClasspathStorageProvider.java | 15 ++++ .../idea/eclipse/config/EclipseFileType.java | 15 ++++ .../eclipse/config/EclipseFileTypeFactory.java | 15 ++++ .../idea/eclipse/config/EclipseModuleManager.java | 18 ++-- .../eclipse/conversion/ConversionException.java} | 22 +++-- .../eclipse/conversion/DotProjectFileHelper.java | 18 ++-- .../eclipse/conversion/EclipseClasspathReader.java | 2 +- .../eclipse/conversion/EclipseClasspathWriter.java | 2 +- .../conversion/EclipseUserLibrariesHelper.java | 18 ++-- .../export/ExportEclipseProjectsAction.java | 15 ++++ .../export/ExportEclipseProjectsDialog.java | 15 ++++ .../eclipse/importWizard/EclipseImportBuilder.java | 15 ++++ .../eclipse/importWizard/EclipseProjectFinder.java | 2 +- .../importWizard/EclipseProjectImportProvider.java | 16 ++++ .../importWizard/EclipseProjectOpenProcessor.java | 16 ++++ .../importWizard/EclipseProjectWizardContext.java} | 18 ++-- .../importWizard/EclipseWorkspaceRootStep.java | 15 ++++ .../idea/eclipse/importWizard/Options.java | 2 +- .../SelectEclipseImportedProjectsStep.java | 16 ++++ .../org/jetbrains/idea/eclipse/util/ErrorLog.java | 15 ++++ .../jetbrains/idea/eclipse/util/JDOMCompare.java | 15 ++++ .../org/jetbrains/idea/eclipse/util/PathUtil.java | 15 ++++ .../copy-every/src/eclipseLib/SourceThree.java} | 19 ++-- .../copy-every/src/eclipseLib/SourceSeven.java} | 19 ++-- .../copy-every/src/eclipseLib/SourceNine.java} | 19 ++-- .../copy-every/src/eclipseLib/SourceOne.java} | 19 ++-- .../all-props/src/pkg/Resident.java | 15 ++++ .../copy-every/src/eclipseLib/SourceTwo.java} | 19 ++-- .../copy-every/src/eclipseLib/SourceThree.java} | 19 ++-- .../copy-every/src/eclipseLib/SourceSeven.java} | 19 ++-- .../copy-every/src/eclipseLib/SourceNine.java} | 19 ++-- .../copy-every/src/eclipseLib/SourceOne.java} | 19 ++-- .../all-props/src/pkg/Resident.java | 15 ++++ .../copy-every/src/eclipseLib/SourceTwo.java} | 19 ++-- .../test/src/plug_me_in_eclipse_3_4/Activator.java | 15 ++++ .../actions/SampleAction.java | 15 ++++ .../idea/eclipse/EclipseClasspathTest.java | 2 +- .../org/jetbrains/idea/eclipse/EclipseImlTest.java | 18 ++-- .../tostring/GenerateToStringConfigurable.java | 15 ++++ .../generate/tostring/GenerateToStringWorker.java | 16 ++++ .../tostring/config/DuplicatonPolicy.java} | 32 +++---- .../generate/tostring/config/InsertWhere.java} | 29 ++++-- .../tostring/template/TemplatesManager.java | 16 ++++ .../tostring/template/TemplatesState.java} | 22 ++--- .../generate/tostring/view/TemplatesPanel.java | 16 ++++ .../view/ToStringTemplateConfigurable.java | 16 ++++ plugins/git4idea/src/git4idea/GitBranch.java | 25 +++--- .../git4idea/src/git4idea/GitBranchesSearcher.java | 18 ++-- .../git4idea/src/git4idea/GitContentRevision.java | 25 +++--- plugins/git4idea/src/git4idea/GitFileRevision.java | 24 +++-- plugins/git4idea/src/git4idea/GitReference.java | 2 +- plugins/git4idea/src/git4idea/GitRemote.java | 2 +- .../git4idea/src/git4idea/GitRevisionNumber.java | 24 +++-- .../src/git4idea/GitRevisionSelector.java} | 41 ++++----- .../git4idea/src/git4idea/GitRootConverter.java | 18 ++-- plugins/git4idea/src/git4idea/GitTag.java | 2 +- plugins/git4idea/src/git4idea/GitUtil.java | 26 +++--- plugins/git4idea/src/git4idea/GitVcs.java | 24 +++-- .../git4idea/src/git4idea/actions/BasicAction.java | 24 +++-- .../actions/GitAbstractRebaseResumeAction.java | 2 +- plugins/git4idea/src/git4idea/actions/GitAdd.java | 24 +++-- .../git4idea/src/git4idea/actions/GitCheckout.java | 2 +- .../src/git4idea/actions/GitCurrentBranch.java | 2 +- .../git4idea/src/git4idea/actions/GitFetch.java | 2 +- plugins/git4idea/src/git4idea/actions/GitInit.java | 2 +- .../src/git4idea/actions/GitMenu.java} | 30 ++++--- .../git4idea/src/git4idea/actions/GitMerge.java | 2 +- .../src/git4idea/actions/GitMergeTool.java | 25 +++--- plugins/git4idea/src/git4idea/actions/GitPull.java | 2 +- plugins/git4idea/src/git4idea/actions/GitPush.java | 2 +- .../git4idea/actions/GitPushActiveBranches.java | 15 ++++ .../git4idea/src/git4idea/actions/GitRebase.java | 15 ++++ .../src/git4idea/actions/GitRebaseAbort.java | 2 +- .../src/git4idea/actions/GitRebaseActionBase.java | 15 ++++ .../src/git4idea/actions/GitRebaseContinue.java | 2 +- .../src/git4idea/actions/GitRebaseSkip.java | 2 +- .../src/git4idea/actions/GitRepositoryAction.java | 2 +- .../src/git4idea/actions/GitResetHead.java | 2 +- .../git4idea/src/git4idea/actions/GitRevert.java | 24 +++-- .../actions/GitShowAllSubmittedFilesAction.java | 2 +- .../git4idea/src/git4idea/actions/GitStash.java | 2 +- plugins/git4idea/src/git4idea/actions/GitTag.java | 2 +- .../git4idea/src/git4idea/actions/GitUnstash.java | 2 +- .../git4idea/annotate/GitAnnotationProvider.java | 20 +++-- .../src/git4idea/annotate/GitFileAnnotation.java | 20 +++-- .../src/git4idea/changes/ChangeCollector.java | 2 +- .../src/git4idea/changes/GitChangeList.java | 20 +++-- .../src/git4idea/changes/GitChangeProvider.java | 25 +++--- .../src/git4idea/changes/GitChangeUtils.java | 15 ++++ .../changes/GitCommittedChangeListProvider.java | 15 ++++ .../changes/GitOutgoingChangesProvider.java | 15 ++++ .../git4idea/changes/GitRepositoryLocation.java | 18 ++-- .../changes/GitVersionFilterComponent.java | 15 ++++ .../src/git4idea/changes/TestOutgoingAction.java | 15 ++++ .../git4idea/checkin/GitCheckinEnvironment.java | 23 +++-- .../checkin/GitPushActiveBranchesDialog.java | 15 ++++ .../src/git4idea/checkin/GitPushDialog.java | 2 +- .../src/git4idea/checkin/GitPushUtils.java | 2 +- .../src/git4idea/checkout/GitCheckoutDialog.java | 2 +- .../src/git4idea/checkout/GitCheckoutProvider.java | 2 +- .../src/git4idea/checkout/GitCloneDialog.java | 2 +- .../git4idea/src/git4idea/commands/GitHandler.java | 2 +- .../src/git4idea/commands/GitHandlerListener.java | 2 +- .../src/git4idea/commands/GitHandlerUtil.java | 2 +- .../src/git4idea/commands/GitLineHandler.java | 2 +- .../git4idea/commands/GitLineHandlerAdapter.java | 2 +- .../git4idea/commands/GitLineHandlerListener.java | 2 +- .../src/git4idea/commands/GitSimpleHandler.java | 2 +- .../src/git4idea/commands/ScriptGenerator.java | 2 +- .../src/git4idea/commands/StringScanner.java | 2 +- .../src/git4idea/config/GitConfigUtil.java | 2 +- .../src/git4idea/config/GitVcsConfigurable.java | 24 +++-- .../git4idea/src/git4idea/config/GitVcsPanel.java | 24 +++-- .../src/git4idea/config/GitVcsSettings.java | 27 +++--- .../git4idea/src/git4idea/config/GitVersion.java | 2 +- .../src/git4idea/diff/GitDiffProvider.java | 26 +++--- .../src/git4idea/diff/GitTreeDiffProvider.java | 18 ++-- .../src/git4idea/history/GitHistoryProvider.java | 25 +++--- .../src/git4idea/history/GitHistoryUtils.java | 2 +- plugins/git4idea/src/git4idea/i18n/GitBundle.java | 15 ++++ .../src/git4idea/merge/GitMergeDialog.java | 2 +- .../src/git4idea/merge/GitMergeProvider.java | 21 ++--- .../git4idea/src/git4idea/merge/GitMergeUtil.java | 2 +- .../git4idea/src/git4idea/merge/GitPullDialog.java | 2 +- .../src/git4idea/merge/MergeChangeCollector.java | 2 +- .../src/git4idea/rebase/GitRebaseActionDialog.java | 2 +- .../src/git4idea/rebase/GitRebaseDialog.java | 2 +- .../src/git4idea/rebase/GitRebaseEditor.java | 2 +- .../git4idea/rebase/GitRebaseEditorHandler.java | 2 +- .../src/git4idea/rebase/GitRebaseEditorMain.java | 2 +- .../git4idea/rebase/GitRebaseEditorService.java | 2 +- .../src/git4idea/rebase/GitRebaseEntry.java | 2 +- .../src/git4idea/rebase/GitRebaseLineListener.java | 15 ++++ .../rebase/GitRebaseUnstructuredEditor.java | 15 ++++ .../src/git4idea/rebase/GitRebaseUtils.java | 2 +- .../git4idea/rollback/GitRollbackEnvironment.java | 2 +- .../src/git4idea/ui/CurrentBranchDialog.java | 2 +- .../git4idea/src/git4idea/ui/GitFetchDialog.java | 2 +- .../src/git4idea/ui/GitReferenceValidator.java | 2 +- .../src/git4idea/ui/GitRefspecAddRefsDialog.java | 2 +- .../git4idea/src/git4idea/ui/GitRefspecPanel.java | 2 +- .../git4idea/src/git4idea/ui/GitResetDialog.java | 2 +- .../git4idea/src/git4idea/ui/GitStashDialog.java | 2 +- plugins/git4idea/src/git4idea/ui/GitTagDialog.java | 2 +- plugins/git4idea/src/git4idea/ui/GitUIUtil.java | 2 +- .../git4idea/src/git4idea/ui/GitUnstashDialog.java | 2 +- .../src/git4idea/update/GitStashUtils.java | 15 ++++ .../src/git4idea/update/GitUpdateConfigurable.java | 15 ++++ .../src/git4idea/update/GitUpdateEnvironment.java | 2 +- .../update/GitUpdateLocallyModifiedDialog.java | 15 ++++ .../src/git4idea/update/GitUpdateOptionsPanel.java | 15 ++++ .../src/git4idea/update/GitUpdateSession.java | 28 +++--- .../validators/GitBranchNameValidator.java | 25 +++--- .../src/git4idea/vfs/GitConfigListener.java | 18 ++-- .../src/git4idea/vfs/GitConfigTracker.java | 18 ++-- .../src/git4idea/vfs/GitFileTypeFactory.java | 18 ++-- .../src/git4idea/vfs/GitFixRootsDialog.java | 18 ++-- .../src/git4idea/vfs/GitIgnoreTracker.java | 18 ++-- .../git4idea/src/git4idea/vfs/GitRootTracker.java | 18 ++-- .../src/git4idea/vfs/GitRootsListener.java} | 23 ++--- .../git4idea/src/git4idea/vfs/GitVFSListener.java | 2 +- .../jetbrains/git4idea/ssh/GitSSHGUIHandler.java | 2 +- .../org/jetbrains/git4idea/ssh/GitSSHHandler.java | 2 +- .../jetbrains/git4idea/ssh/GitSSHIdeaClient.java | 2 +- .../org/jetbrains/git4idea/ssh/GitSSHService.java | 2 +- .../src/org/jetbrains/git4idea/ssh/SSHConfig.java | 2 +- .../src/org/jetbrains/git4idea/ssh/SSHMain.java | 2 +- .../tests/git4idea/tests/GitRemoteTest.java | 18 ++-- .../tests/git4idea/tests/GitUtilsTest.java} | 19 ++-- plugins/svn4idea/svn4idea.iml | 1 - 904 files changed, 10758 insertions(+), 2662 deletions(-) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => AntHighlightRangeExtension.java} (61%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => AntLanguage.java} (66%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => AntNamesValidator.java} (61%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => HelpID.java} (74%) copy plugins/ant/src/com/intellij/lang/ant/config/{AntBuildModel.java => AntBuildModelBase.java} (63%) copy plugins/ant/src/com/intellij/lang/ant/config/{AntNoFileException.java => ExecutionEvent.java} (56%) copy plugins/ant/src/com/intellij/lang/ant/config/{AntNoFileException.java => execution/RunCanceledException.java} (55%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => config/impl/HelpID.java} (70%) copy plugins/{cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java => ant/src/com/intellij/lang/ant/config/impl/WrongNameFormatException.java} (62%) copy plugins/ant/src/com/intellij/lang/ant/{config/AntBuildListener.java => misc/AntStringInterner.java} (61%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => psi/AntAllTasksContainer.java} (68%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => psi/AntAnt.java} (70%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => psi/AntCall.java} (66%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => psi/AntComment.java} (70%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => psi/AntDefTask.java} (71%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => psi/AntFilesProvider.java} (61%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => psi/AntImport.java} (70%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => psi/AntMacroDef.java} (70%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => psi/AntNameIdentifier.java} (58%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => psi/AntPresetDef.java} (70%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => psi/AntScriptDef.java} (70%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => psi/AntTask.java} (70%) copy plugins/{devkit/src/util/ActionData.java => ant/src/com/intellij/lang/ant/psi/impl/reference/AntReference.java} (61%) copy plugins/ant/src/com/intellij/lang/ant/{PsiAntElement.java => refactoring/AntVetoRenameCondition.java} (61%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntBuildFile.java => commander/src/com/intellij/ide/commander/CommanderToolWindowFactory.java} (51%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => copyright/src/com/maddyhome/idea/copyright/CopyrightUpdaters.java} (55%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => copyright/src/com/maddyhome/idea/copyright/options/JavaOptions.java} (70%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => copyright/src/com/maddyhome/idea/copyright/options/XmlOptions.java} (71%) copy plugins/{cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java => copyright/src/com/maddyhome/idea/copyright/pattern/ModuleInfo.java} (62%) copy plugins/{cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java => copyright/src/com/maddyhome/idea/copyright/pattern/ProjectInfo.java} (62%) copy plugins/{cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java => copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyright.java} (62%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntBuildFile.java => copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyrightInstanceFactory.java} (56%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => copyright/src/com/maddyhome/idea/copyright/ui/TemplateOptionsPanelListener.java} (70%) copy plugins/cvs/cvs-core/src/com/intellij/{openapi/cvsIntegration/DateOrRevision.java => cvsSupport2/connections/CvsRootSettingsBuilder.java} (66%) copy plugins/cvs/cvs-core/src/com/intellij/{openapi/cvsIntegration/DateOrRevision.java => cvsSupport2/connections/CvsSettings.java} (62%) copy plugins/{git4idea/src/git4idea/commands/GitHandlerListener.java => cvs/cvs-core/src/com/intellij/cvsSupport2/connections/login/CvsLoginWorker.java} (52%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntBuildModel.java => cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/ConnectionPoolI.java} (61%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/LifeStages.java} (70%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntBuildModel.java => cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SSHPasswordProvider.java} (65%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SmPublicKeyAuthentification.java} (68%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SolveableAuthenticationException.java} (52%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntBuildModel.java => cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshAuthentication.java} (56%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshLogger.java} (57%) copy plugins/cvs/cvs-core/src/com/intellij/{openapi/cvsIntegration/DateOrRevision.java => cvsSupport2/cvsExecution/ModalityContext.java} (67%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-core/src/com/intellij/cvsSupport2/errorHandling/ErrorRegistry.java} (71%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsActionPlaces.java} (61%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractActionFromEditGroup.java} (52%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/Cvs2Group.java} (53%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/GlobalSettingsAction.java} (59%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchOffAction.java} (55%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchOnAction.java} (55%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsDataConstants.java} (56%) copy plugins/{devkit/src/util/ActionData.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeDataProvider.java} (57%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntBuildModel.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsDiffColors.java} (54%) copy plugins/{git4idea/src/git4idea/commands/GitLineHandlerAdapter.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/VirtualFileEntry.java} (52%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsRootEditor.java} (70%) rewrite plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsListCellRenderer.java (72%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/SelfTestingConnection.java} (62%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsModule.java} (59%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/FolderDataProvider.java} (56%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/GetContentCallback.java} (54%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/LoginAbortedException.java} (66%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntBuildListener.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/RemoteResourceDataProvider.java} (56%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoredFilesInfo.java} (54%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AllFilesInProject.java} (55%) copy plugins/{devkit/src/util/ActionData.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/PostCvsActivity.java} (50%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/ReceivedFileProcessor.java} (56%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/RepositoryPathProvider.java} (71%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutFileByRevisionOperation.java} (55%) rewrite plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/FileCellRenderer.java (72%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/DirectoryContentProvider.java} (67%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsErrors/ErrorProcessor.java} (64%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsListenersCollection.java} (70%) copy plugins/{git4idea/src/git4idea/commands/GitLineHandlerAdapter.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/MessageEvent.java} (50%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/BranchesProvider.java} (63%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsProvider.java} (61%) copy plugins/{devkit/src/util/ActionData.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsProviderOnEnvironment.java} (53%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/CvsTagDialog.java} (55%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagNameFieldOwner.java} (69%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/MergedWithConflictProjectOrModuleFile.java} (52%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsEntriesListener.java} (67%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/CannotFindCvsRootException.java} (60%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/CvsProcessException.java} (70%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntConfigurationListener.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/InvalidModuleDescriptionException.java} (60%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileRevision.java} (62%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/CvsCommandStopper.java} (57%) copy plugins/{git4idea/src/git4idea/commands/GitLineHandlerAdapter.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/FileReadOnlyHandler.java} (51%) copy plugins/cvs/{cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java => cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/ProjectContentInfoProvider.java} (66%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsRootChangeListener.java} (71%) copy plugins/devkit/src/{util/ActionData.java => dom/Actions.java} (57%) copy plugins/devkit/src/{util/ActionData.java => dom/Dependency.java} (51%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => devkit/src/dom/Extension.java} (60%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => devkit/src/dom/ExtensionPoints.java} (57%) copy plugins/devkit/src/{util/ActionData.java => dom/IdeaVersion.java} (51%) copy plugins/devkit/src/{util/ActionData.java => dom/ProjectComponents.java} (57%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => devkit/src/dom/impl/IdeaPluginImpl.java} (56%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntBuildListener.java => eclipse/src/org/jetbrains/idea/eclipse/conversion/ConversionException.java} (61%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectWizardContext.java} (66%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => eclipse/testData/iml/allProps/eclipse-externals/lib-3/copy-every/src/eclipseLib/SourceThree.java} (66%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => eclipse/testData/iml/allProps/eclipse-vars/lib-7/copy-every/src/eclipseLib/SourceSeven.java} (66%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => eclipse/testData/iml/allProps/eclipse-vars/lib-9/copy-every/src/eclipseLib/SourceNine.java} (66%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/all-props/lib-1/copy-every/src/eclipseLib/SourceOne.java} (66%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/ws-internals/lib-2/copy-every/src/eclipseLib/SourceTwo.java} (66%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => eclipse/testData/round/allProps/eclipse-externals/lib-3/copy-every/src/eclipseLib/SourceThree.java} (66%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => eclipse/testData/round/allProps/eclipse-vars/lib-7/copy-every/src/eclipseLib/SourceSeven.java} (66%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => eclipse/testData/round/allProps/eclipse-vars/lib-9/copy-every/src/eclipseLib/SourceNine.java} (66%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/all-props/lib-1/copy-every/src/eclipseLib/SourceOne.java} (66%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/ws-internals/lib-2/copy-every/src/eclipseLib/SourceTwo.java} (66%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntBuildModel.java => generate-tostring/src/org/jetbrains/generate/tostring/config/DuplicatonPolicy.java} (56%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => generate-tostring/src/org/jetbrains/generate/tostring/config/InsertWhere.java} (54%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => generate-tostring/src/org/jetbrains/generate/tostring/template/TemplatesState.java} (64%) copy plugins/{devkit/src/util/ActionData.java => git4idea/src/git4idea/GitRevisionSelector.java} (56%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntNoFileException.java => git4idea/src/git4idea/actions/GitMenu.java} (53%) copy plugins/{ant/src/com/intellij/lang/ant/config/AntConfigurationListener.java => git4idea/src/git4idea/vfs/GitRootsListener.java} (56%) copy plugins/{ant/src/com/intellij/lang/ant/PsiAntElement.java => git4idea/tests/git4idea/tests/GitUtilsTest.java} (59%) diff --git a/plugins/ant/src/com/intellij/lang/ant/AntBundle.java b/plugins/ant/src/com/intellij/lang/ant/AntBundle.java index 5548287142..552e5172ff 100644 --- a/plugins/ant/src/com/intellij/lang/ant/AntBundle.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntBundle.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/ant/src/com/intellij/lang/ant/AntDeclarationRangeHandler.java b/plugins/ant/src/com/intellij/lang/ant/AntDeclarationRangeHandler.java index d7052c4d43..fdb6ef25d2 100644 --- a/plugins/ant/src/com/intellij/lang/ant/AntDeclarationRangeHandler.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntDeclarationRangeHandler.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant; import com.intellij.codeInsight.hint.DeclarationRangeHandler; diff --git a/plugins/ant/src/com/intellij/lang/ant/AntDefaultNSProvider.java b/plugins/ant/src/com/intellij/lang/ant/AntDefaultNSProvider.java index 9e35664eaf..26d85dfb3d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/AntDefaultNSProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntDefaultNSProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant; import com.intellij.lang.ant.psi.impl.AntFileImpl; diff --git a/plugins/ant/src/com/intellij/lang/ant/AntElementRole.java b/plugins/ant/src/com/intellij/lang/ant/AntElementRole.java index c494fe7610..9802c27a07 100644 --- a/plugins/ant/src/com/intellij/lang/ant/AntElementRole.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntElementRole.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/ant/src/com/intellij/lang/ant/AntFileType.java b/plugins/ant/src/com/intellij/lang/ant/AntFileType.java index f0499db214..ef66afe420 100644 --- a/plugins/ant/src/com/intellij/lang/ant/AntFileType.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntFileType.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant; import com.intellij.ide.IdeBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/AntHighlightRangeExtension.java similarity index 61% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/AntHighlightRangeExtension.java index f044a3bc10..f534a81c29 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntHighlightRangeExtension.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -15,12 +15,16 @@ */ package com.intellij.lang.ant; -import com.intellij.psi.PsiElement; +import com.intellij.codeInsight.daemon.impl.HighlightRangeExtension; +import com.intellij.psi.PsiFile; +import com.intellij.xml.util.XmlUtil; /** - * @author dyoma + * @author yole */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class AntHighlightRangeExtension implements HighlightRangeExtension { + + public boolean isForceHighlightParents(final PsiFile file) { + return XmlUtil.isAntFile(file); + } } diff --git a/plugins/ant/src/com/intellij/lang/ant/AntInspectionToolProvider.java b/plugins/ant/src/com/intellij/lang/ant/AntInspectionToolProvider.java index 52dbe7facf..4793524ec7 100644 --- a/plugins/ant/src/com/intellij/lang/ant/AntInspectionToolProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntInspectionToolProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant; import com.intellij.codeInspection.InspectionToolProvider; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/AntLanguage.java similarity index 66% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/AntLanguage.java index f044a3bc10..fe89dd7ea2 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntLanguage.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -15,12 +15,14 @@ */ package com.intellij.lang.ant; -import com.intellij.psi.PsiElement; +import com.intellij.lang.DependentLanguage; +import com.intellij.lang.Language; +import com.intellij.lang.StdLanguages; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class AntLanguage extends Language implements DependentLanguage{ + + public AntLanguage() { + super("ANT"); + StdLanguages.ANT = this; + } } diff --git a/plugins/ant/src/com/intellij/lang/ant/AntLanguageExtension.java b/plugins/ant/src/com/intellij/lang/ant/AntLanguageExtension.java index 672e5365b1..4c3600308c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/AntLanguageExtension.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntLanguageExtension.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant; import com.intellij.lang.Language; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/AntNamesValidator.java similarity index 61% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/AntNamesValidator.java index f044a3bc10..e881c7d934 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntNamesValidator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +/* + * @author max + */ package com.intellij.lang.ant; -import com.intellij.psi.PsiElement; +import com.intellij.lang.refactoring.NamesValidator; +import com.intellij.openapi.project.Project; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); -} +public class AntNamesValidator implements NamesValidator { + public boolean isKeyword(String name, Project project) { + return false; + } + + public boolean isIdentifier(String name, Project project) { + return true; + } +} \ No newline at end of file diff --git a/plugins/ant/src/com/intellij/lang/ant/AntParserDefinition.java b/plugins/ant/src/com/intellij/lang/ant/AntParserDefinition.java index d367cb604d..4d9738d217 100644 --- a/plugins/ant/src/com/intellij/lang/ant/AntParserDefinition.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntParserDefinition.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant; import com.intellij.lang.*; diff --git a/plugins/ant/src/com/intellij/lang/ant/AntPropertyRefSelectioner.java b/plugins/ant/src/com/intellij/lang/ant/AntPropertyRefSelectioner.java index 77f62e68b5..1ab36d62b0 100644 --- a/plugins/ant/src/com/intellij/lang/ant/AntPropertyRefSelectioner.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntPropertyRefSelectioner.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant; import com.intellij.codeInsight.editorActions.ExtendWordSelectionHandler; diff --git a/plugins/ant/src/com/intellij/lang/ant/AntStructureViewBuilderFactory.java b/plugins/ant/src/com/intellij/lang/ant/AntStructureViewBuilderFactory.java index 56d78f296c..e5875b378c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/AntStructureViewBuilderFactory.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntStructureViewBuilderFactory.java @@ -1,4 +1,20 @@ /* + * 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. + */ + +/* * @author max */ package com.intellij.lang.ant; diff --git a/plugins/ant/src/com/intellij/lang/ant/AntSupport.java b/plugins/ant/src/com/intellij/lang/ant/AntSupport.java index 27ab5dd57b..3808cb3519 100644 --- a/plugins/ant/src/com/intellij/lang/ant/AntSupport.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntSupport.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant; import com.intellij.lang.CompositeLanguage; diff --git a/plugins/ant/src/com/intellij/lang/ant/ForcedAntFileAttribute.java b/plugins/ant/src/com/intellij/lang/ant/ForcedAntFileAttribute.java index 73039bcc40..241a4dad2e 100644 --- a/plugins/ant/src/com/intellij/lang/ant/ForcedAntFileAttribute.java +++ b/plugins/ant/src/com/intellij/lang/ant/ForcedAntFileAttribute.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/HelpID.java similarity index 74% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/HelpID.java index f044a3bc10..ded80b2284 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/HelpID.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -15,12 +15,8 @@ */ package com.intellij.lang.ant; -import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.NonNls; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface HelpID { + @NonNls String FIND_OTHER_USAGES = "find.findOtherUsages"; } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java index f044a3bc10..0562603fd3 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildFile.java b/plugins/ant/src/com/intellij/lang/ant/config/AntBuildFile.java index 0e03ae4ade..37a2382955 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildFile.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/AntBuildFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildFileBase.java b/plugins/ant/src/com/intellij/lang/ant/config/AntBuildFileBase.java index 50aed6b5e6..42ea121d7b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildFileBase.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/AntBuildFileBase.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config; import com.intellij.openapi.util.InvalidDataException; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildListener.java b/plugins/ant/src/com/intellij/lang/ant/config/AntBuildListener.java index 7fa229e2d1..f9c7d32b83 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildListener.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/AntBuildListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java b/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java index 91556fe81b..d55a81d067 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java b/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModelBase.java similarity index 63% copy from plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java copy to plugins/ant/src/com/intellij/lang/ant/config/AntBuildModelBase.java index 91556fe81b..5891e1340b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModelBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,24 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.intellij.lang.ant.config; +import com.intellij.lang.ant.config.impl.BuildTask; +import com.intellij.lang.ant.psi.AntProject; import org.jetbrains.annotations.Nullable; -public interface AntBuildModel { - @Nullable - String getDefaultTargetName(); - - AntBuildTarget[] getTargets(); - - AntBuildTarget[] getFilteredTargets(); - - AntBuildFile getBuildFile(); +public interface AntBuildModelBase extends AntBuildModel { @Nullable - AntBuildTarget findTarget(final String name); + String getDefaultTargetActionId(); @Nullable - String getName(); + BuildTask findTask(final String targetName, final String taskName); + + AntProject getAntProject(); + + boolean hasTargetWithActionId(final String id); } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildTarget.java b/plugins/ant/src/com/intellij/lang/ant/config/AntBuildTarget.java index efd6502078..000fa71240 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildTarget.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/AntBuildTarget.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildTargetBase.java b/plugins/ant/src/com/intellij/lang/ant/config/AntBuildTargetBase.java index 87832bc8df..110ee03e4d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildTargetBase.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/AntBuildTargetBase.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config; import com.intellij.lang.ant.config.impl.BuildTask; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntConfiguration.java b/plugins/ant/src/com/intellij/lang/ant/config/AntConfiguration.java index 2371bd7768..ba71d8568f 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntConfiguration.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/AntConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntConfigurationBase.java b/plugins/ant/src/com/intellij/lang/ant/config/AntConfigurationBase.java index 3602086837..4da90b4985 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntConfigurationBase.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/AntConfigurationBase.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config; import com.intellij.lang.ant.config.impl.AntInstallation; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntConfigurationListener.java b/plugins/ant/src/com/intellij/lang/ant/config/AntConfigurationListener.java index 0dca8ce522..67d81c87e3 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntConfigurationListener.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/AntConfigurationListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java index e1da04a96a..881a69d69c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/ant/src/com/intellij/lang/ant/config/ExecutionEvent.java similarity index 56% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/ant/src/com/intellij/lang/ant/config/ExecutionEvent.java index e1da04a96a..a7b509f96b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/ExecutionEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.intellij.lang.ant.config; -import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.InvalidDataException; +import org.jdom.Element; + +public abstract class ExecutionEvent { + public abstract String getTypeId(); -public class AntNoFileException extends Exception { - private final VirtualFile myFile; + public abstract String getPresentableName(); - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; + public void readExternal(Element element, Project project) throws InvalidDataException{ } - public VirtualFile getFile() { - return myFile; + public String writeExternal(Element element, Project project) { + return getTypeId(); } } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/AddAntBuildFile.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/AddAntBuildFile.java index a8bf99256f..40319487f8 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/AddAntBuildFile.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/AddAntBuildFile.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.actions; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/AntBuildFilePropertiesAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/AntBuildFilePropertiesAction.java index 8efa4c0ef3..38db290add 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/AntBuildFilePropertiesAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/AntBuildFilePropertiesAction.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.actions; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/AntBuildGroup.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/AntBuildGroup.java index f5fdb44c83..6ed6ba7be9 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/AntBuildGroup.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/AntBuildGroup.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.actions; import com.intellij.lang.ant.config.*; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/ChangeViewAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/ChangeViewAction.java index 31f42c8d49..61271b2020 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/ChangeViewAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/ChangeViewAction.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.actions; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/PauseOutputAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/PauseOutputAction.java index 0acd468983..c10b602e20 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/PauseOutputAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/PauseOutputAction.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.actions; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/RemoveBuildFileAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/RemoveBuildFileAction.java index a735b5cdb7..50e18a0230 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/RemoveBuildFileAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/RemoveBuildFileAction.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.actions; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/RunAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/RunAction.java index 6909d81b1d..3dd024b0ee 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/RunAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/RunAction.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.actions; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/StopAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/StopAction.java index 80c5a58948..b49b5fdb01 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/StopAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/StopAction.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.actions; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetAction.java index 06159b2bf3..889d8170b4 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetAction.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.actions; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetActionStub.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetActionStub.java index fbd002cb2c..2b87fe2609 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetActionStub.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/TargetActionStub.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * 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.lang.ant.config.actions; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/VerboseAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/VerboseAction.java index 3563ef56b6..d40e0b0945 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/VerboseAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/VerboseAction.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.actions; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntBuildMessageView.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntBuildMessageView.java index 23ee785ed6..81e571f7aa 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntBuildMessageView.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntBuildMessageView.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.execution; import com.intellij.ide.CommonActionsManager; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntCommandLineBuilder.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntCommandLineBuilder.java index ba5643ebf1..6acf22eda5 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntCommandLineBuilder.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntCommandLineBuilder.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.execution; import com.intellij.execution.CantRunException; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntMessage.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntMessage.java index 81f2d2b8d0..c5c9995a18 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntMessage.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntMessage.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.execution; import com.intellij.openapi.vfs.VirtualFile; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntOutputView.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntOutputView.java index 06a1cce795..85d51a7cb6 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/AntOutputView.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/AntOutputView.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.execution; import javax.swing.*; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java index 8ae65da01a..0cbdee195f 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/ExecutionHandler.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.execution; import com.intellij.concurrency.JobScheduler; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/HyperlinkUtil.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/HyperlinkUtil.java index 88a5a775c2..83f735399d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/HyperlinkUtil.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/HyperlinkUtil.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.execution; import com.intellij.openapi.application.ApplicationManager; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/InputRequestHandler.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/InputRequestHandler.java index 64a051695d..5bd77dff3b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/InputRequestHandler.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/InputRequestHandler.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.execution; import com.intellij.execution.junit2.segments.SegmentReader; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageNode.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageNode.java index 4c7b2e2c71..42502723d1 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageNode.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageNode.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.execution; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java index ca0fed4194..532a85ccca 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.execution; import com.intellij.openapi.util.IconLoader; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/OutputParser.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/OutputParser.java index 24cb2c3bc2..a739bf0167 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/OutputParser.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/OutputParser.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.execution; import com.intellij.compiler.impl.javaCompiler.javac.JavacOutputParser; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/OutputParser2.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/OutputParser2.java index 5737d66954..0c63bd9531 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/OutputParser2.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/OutputParser2.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.execution; import com.intellij.execution.junit.JUnitProcessHandler; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/PathUtilEx.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/PathUtilEx.java index ff19a7bc4b..163d9bd594 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/PathUtilEx.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/PathUtilEx.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.execution; import com.intellij.openapi.module.Module; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/PlainTextView.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/PlainTextView.java index a79c31246e..b6a4f4fb7e 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/PlainTextView.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/PlainTextView.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.execution; import com.intellij.execution.filters.Filter; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/RunCanceledException.java similarity index 55% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/ant/src/com/intellij/lang/ant/config/execution/RunCanceledException.java index e1da04a96a..9885d972eb 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/RunCanceledException.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.lang.ant.config.execution; -package com.intellij.lang.ant.config; +import com.intellij.execution.CantRunException; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.vfs.VirtualFile; - -public class AntNoFileException extends Exception { - private final VirtualFile myFile; - - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; +public class RunCanceledException extends CantRunException { + public RunCanceledException(String message) { + super(message); } - public VirtualFile getFile() { - return myFile; + public void showMessage(Project project, String title) { + Messages.showInfoMessage(project, getMessage(), title); } } + diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/TreeView.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/TreeView.java index 2e7399b098..27b2ed92e3 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/TreeView.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/TreeView.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.execution; import com.intellij.ide.CopyProvider; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntBuildFileNodeDescriptor.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntBuildFileNodeDescriptor.java index 755488ec5c..9e19929db7 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntBuildFileNodeDescriptor.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntBuildFileNodeDescriptor.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.explorer; import com.intellij.ide.util.treeView.NodeDescriptor; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java index ce1cb00b87..0f40cbb45d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.explorer; import com.intellij.ide.CommonActionsManager; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeBuilder.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeBuilder.java index 39c9c1037f..0389ed8cc1 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeBuilder.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeBuilder.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.explorer; import com.intellij.ide.util.treeView.AbstractTreeBuilder; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeStructure.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeStructure.java index d07a33fede..bcfbce8342 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeStructure.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorerTreeStructure.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.explorer; import com.intellij.ide.util.treeView.AbstractTreeStructure; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntNodeDescriptor.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntNodeDescriptor.java index bbf2d4cea5..d300b9faa5 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntNodeDescriptor.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntNodeDescriptor.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.explorer; import com.intellij.ide.util.treeView.NodeDescriptor; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntTargetNodeDescriptor.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntTargetNodeDescriptor.java index 849daac146..05f551fe56 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntTargetNodeDescriptor.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntTargetNodeDescriptor.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.explorer; import com.intellij.execution.RunManagerEx; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/ExecuteOnRunDialog.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/ExecuteOnRunDialog.java index ab8282318f..61fb4309d4 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/ExecuteOnRunDialog.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/ExecuteOnRunDialog.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.explorer; import com.intellij.execution.RunManager; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/SaveMetaTargetDialog.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/SaveMetaTargetDialog.java index 6e59f9aa85..28ad12a982 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/SaveMetaTargetDialog.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/SaveMetaTargetDialog.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.explorer; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AllJarsUnderDirEntry.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AllJarsUnderDirEntry.java index c542f64f36..1d2001e994 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AllJarsUnderDirEntry.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AllJarsUnderDirEntry.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.openapi.fileChooser.FileChooser; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntArtifactPostprocessingProperties.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntArtifactPostprocessingProperties.java index 17cdd7a27f..afcfb64d52 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntArtifactPostprocessingProperties.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntArtifactPostprocessingProperties.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.lang.ant.config.*; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntArtifactPostprocessingPropertiesEditor.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntArtifactPostprocessingPropertiesEditor.java index b60a21e156..58cc42c189 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntArtifactPostprocessingPropertiesEditor.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntArtifactPostprocessingPropertiesEditor.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.lang.ant.config.AntBuildTarget; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntArtifactPostprocessingPropertiesProvider.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntArtifactPostprocessingPropertiesProvider.java index 84426fff4a..05cd6cb25c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntArtifactPostprocessingPropertiesProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntArtifactPostprocessingPropertiesProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.packaging.artifacts.ArtifactProperties; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTask.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTask.java index afee7d05bc..136f49bfce 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTask.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTask.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.execution.BeforeRunTask; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTaskProvider.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTaskProvider.java index 896fddd77e..cc9c9e49f0 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTaskProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTaskProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.execution.BeforeRunTaskProvider; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBreadcrumbsInfoProvider.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBreadcrumbsInfoProvider.java index e7e08dfa87..626dc22010 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBreadcrumbsInfoProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBreadcrumbsInfoProvider.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.config.impl; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileClassLoaderHolder.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileClassLoaderHolder.java index f4b1f321d1..61e9707bea 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileClassLoaderHolder.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileClassLoaderHolder.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileImpl.java index 0313532dc8..a7a6de58e1 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildFileImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildModelImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildModelImpl.java index 5cc40af22c..12a23d2243 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildModelImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildModelImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.lang.ant.config.*; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildTargetImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildTargetImpl.java index 992241a9ec..d5049cfef0 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildTargetImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBuildTargetImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.lang.ant.AntSupport; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntClasspathEntry.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntClasspathEntry.java index afe2985f60..1c1f245c6f 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntClasspathEntry.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntClasspathEntry.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.openapi.roots.ui.util.CompositeAppearance; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java index 520b9c5d7d..7f634c1cad 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntInstallation.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntInstallation.java index 807874cb4c..0084444e6b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntInstallation.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntInstallation.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntInstallationClassLoaderHolder.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntInstallationClassLoaderHolder.java index ee1ba1a3db..3b9925c201 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntInstallationClassLoaderHolder.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntInstallationClassLoaderHolder.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntKeymapExtension.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntKeymapExtension.java index 5c7f931197..f0759d77dd 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntKeymapExtension.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntKeymapExtension.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.lang.ant.config.AntBuildFile; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntProjectComponent.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntProjectComponent.java index f958b6fac2..5bd42eee6f 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntProjectComponent.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntProjectComponent.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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. */ /* diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntReference.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntReference.java index 4015b83c12..f9f8d0d9eb 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntReference.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.execution.CantRunException; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntResourcesClassLoader.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntResourcesClassLoader.java index f37a4d6c09..de34e9ed9e 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntResourcesClassLoader.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntResourcesClassLoader.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.openapi.progress.ProgressManager; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntToolwindowRegistrar.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntToolwindowRegistrar.java index 653e0a2dbe..167b14a557 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntToolwindowRegistrar.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntToolwindowRegistrar.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.config.impl; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java index 91a1777811..e517ede349 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntWorkspaceConfiguration.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.lang.ant.config.AntBuildFile; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/BuildFileProperty.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/BuildFileProperty.java index e6e268dc2d..2b99d60f35 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/BuildFileProperty.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/BuildFileProperty.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.openapi.util.JDOMExternalizable; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/BuildTask.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/BuildTask.java index 42ca08338a..b55e96b335 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/BuildTask.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/BuildTask.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.lang.ant.config.AntBuildTargetBase; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/ClassLoaderHolder.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/ClassLoaderHolder.java index 9990190265..3024f6830f 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/ClassLoaderHolder.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/ClassLoaderHolder.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.config.impl; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/CompositePropertyContainer.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/CompositePropertyContainer.java index 87915adc90..4f1a27e42b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/CompositePropertyContainer.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/CompositePropertyContainer.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.openapi.application.ApplicationManager; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteAfterCompilationEvent.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteAfterCompilationEvent.java index d5ebf6d894..344a6019ac 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteAfterCompilationEvent.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteAfterCompilationEvent.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteBeforeCompilationEvent.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteBeforeCompilationEvent.java index 96472a542d..34d1e8b1dd 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteBeforeCompilationEvent.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteBeforeCompilationEvent.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteCompositeTargetEvent.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteCompositeTargetEvent.java index 924661ca4c..853d6c55f1 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteCompositeTargetEvent.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/ExecuteCompositeTargetEvent.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.lang.ant.config.ExecutionEvent; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/GlobalAntConfiguration.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/GlobalAntConfiguration.java index 1aae03d45a..38411be185 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/GlobalAntConfiguration.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/GlobalAntConfiguration.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.ide.macro.MacroManager; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/HelpID.java similarity index 70% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/config/impl/HelpID.java index f044a3bc10..6ae716f61d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/HelpID.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.lang.ant.config.impl; -import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.NonNls; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface HelpID { + @NonNls String ANT = "ant.antToolWindow"; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/MetaTarget.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/MetaTarget.java index edb92f5888..dade66bc6d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/MetaTarget.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/MetaTarget.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/SinglePathEntry.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/SinglePathEntry.java index 0954ab4584..10268fedbf 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/SinglePathEntry.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/SinglePathEntry.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.openapi.fileChooser.FileChooser; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetChooserDialog.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetChooserDialog.java index 5f0c3e04d2..df7a61467b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetChooserDialog.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetChooserDialog.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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. */ /* diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetFilter.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetFilter.java index 7a0f01e4fe..04f3ba5c3d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetFilter.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetFilter.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl; import com.intellij.lang.ant.config.AntBuildTarget; diff --git a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/WrongNameFormatException.java similarity index 62% copy from plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java copy to plugins/ant/src/com/intellij/lang/ant/config/impl/WrongNameFormatException.java index 5ef412416e..89d21f8f1c 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/WrongNameFormatException.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.cvsIntegration; +package com.intellij.lang.ant.config.impl; +import com.intellij.lang.ant.AntBundle; -public interface DateOrRevision { - public String getBranch(); - public boolean shouldUseBranch(); - public String getDate(); - public boolean shouldUseDate(); -} + +public final class WrongNameFormatException extends Exception { + public WrongNameFormatException(final String name) { + super(AntBundle.message("execute.target.wrong.name.format.error.message", name)); + } +} \ No newline at end of file diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AnActionListEditor.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AnActionListEditor.java index 6a042aea3f..7505748709 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AnActionListEditor.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AnActionListEditor.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl.configuration; import com.intellij.execution.ExecutionBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntClasspathEditorPanel.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntClasspathEditorPanel.java index f8cc873d04..c71c6b5f0e 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntClasspathEditorPanel.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntClasspathEditorPanel.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl.configuration; import com.intellij.lang.ant.config.impl.AllJarsUnderDirEntry; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntSetPanel.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntSetPanel.java index 090df055da..9c4c435d1b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntSetPanel.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntSetPanel.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl.configuration; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java index bc320e7c6a..22258f8fa5 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl.configuration; import com.intellij.ide.macro.MacrosDialog; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/BuildFilePropertiesPanel.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/BuildFilePropertiesPanel.java index 266f6f403b..ae3b69b9ba 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/BuildFilePropertiesPanel.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/BuildFilePropertiesPanel.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl.configuration; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/ChooseAndEditComboBoxController.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/ChooseAndEditComboBoxController.java index ea9f2d7a18..d2f2d509c1 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/ChooseAndEditComboBoxController.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/ChooseAndEditComboBoxController.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl.configuration; import com.intellij.ui.SortedComboBoxModel; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/EditPropertyContainer.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/EditPropertyContainer.java index cd384046fa..97ee793318 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/EditPropertyContainer.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/EditPropertyContainer.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl.configuration; import com.intellij.util.config.AbstractProperty; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/ReorderableListToolbar.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/ReorderableListToolbar.java index be5d51caa9..4080a28b0c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/ReorderableListToolbar.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/ReorderableListToolbar.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl.configuration; import com.intellij.openapi.actionSystem.ActionManager; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/RunWithAntBinding.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/RunWithAntBinding.java index d1d239bb2a..5663e4fdd1 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/RunWithAntBinding.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/RunWithAntBinding.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl.configuration; import com.intellij.lang.ant.config.impl.AntBuildFileImpl; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/UIPropertyBinding.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/UIPropertyBinding.java index 39278648ed..94d29bd829 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/UIPropertyBinding.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/UIPropertyBinding.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.config.impl.configuration; import com.intellij.openapi.util.Factory; diff --git a/plugins/ant/src/com/intellij/lang/ant/doc/AntDocumentationProvider.java b/plugins/ant/src/com/intellij/lang/ant/doc/AntDocumentationProvider.java index d74af63bf9..f4bc7e2c58 100644 --- a/plugins/ant/src/com/intellij/lang/ant/doc/AntDocumentationProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/doc/AntDocumentationProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.doc; import com.intellij.lang.ant.AntElementRole; diff --git a/plugins/ant/src/com/intellij/lang/ant/misc/AntPsiUtil.java b/plugins/ant/src/com/intellij/lang/ant/misc/AntPsiUtil.java index 42b94b8654..4f76e28586 100644 --- a/plugins/ant/src/com/intellij/lang/ant/misc/AntPsiUtil.java +++ b/plugins/ant/src/com/intellij/lang/ant/misc/AntPsiUtil.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.misc; import com.intellij.lang.ant.psi.AntElement; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildListener.java b/plugins/ant/src/com/intellij/lang/ant/misc/AntStringInterner.java similarity index 61% copy from plugins/ant/src/com/intellij/lang/ant/config/AntBuildListener.java copy to plugins/ant/src/com/intellij/lang/ant/misc/AntStringInterner.java index 7fa229e2d1..1fe1702d62 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildListener.java +++ b/plugins/ant/src/com/intellij/lang/ant/misc/AntStringInterner.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.lang.ant.misc; -package com.intellij.lang.ant.config; +import com.intellij.util.containers.StringInterner; -public interface AntBuildListener { +public class AntStringInterner { - int FINISHED_SUCCESSFULLY = 0; - int ABORTED = 1; - int FAILED_TO_RUN = 2; + private static final StringInterner ourInterner = new StringInterner(); - AntBuildListener NULL = new AntBuildListener() { - public void buildFinished(int state, int errorCount) { } - }; + public static String intern(final String str) { + return ourInterner.intern(str); + } - void buildFinished(int state, int errorCount); + private AntStringInterner() { + } } diff --git a/plugins/ant/src/com/intellij/lang/ant/misc/PsiElementSetSpinAllocator.java b/plugins/ant/src/com/intellij/lang/ant/misc/PsiElementSetSpinAllocator.java index e153570737..e2243531d1 100644 --- a/plugins/ant/src/com/intellij/lang/ant/misc/PsiElementSetSpinAllocator.java +++ b/plugins/ant/src/com/intellij/lang/ant/misc/PsiElementSetSpinAllocator.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.misc; import com.intellij.psi.PsiElement; diff --git a/plugins/ant/src/com/intellij/lang/ant/misc/PsiElementWithValueSetSpinAllocator.java b/plugins/ant/src/com/intellij/lang/ant/misc/PsiElementWithValueSetSpinAllocator.java index 552bf487bd..9491227b37 100644 --- a/plugins/ant/src/com/intellij/lang/ant/misc/PsiElementWithValueSetSpinAllocator.java +++ b/plugins/ant/src/com/intellij/lang/ant/misc/PsiElementWithValueSetSpinAllocator.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.misc; import com.intellij.openapi.util.Pair; diff --git a/plugins/ant/src/com/intellij/lang/ant/misc/PsiReferenceListSpinAllocator.java b/plugins/ant/src/com/intellij/lang/ant/misc/PsiReferenceListSpinAllocator.java index 753d5c9b81..efc7425077 100644 --- a/plugins/ant/src/com/intellij/lang/ant/misc/PsiReferenceListSpinAllocator.java +++ b/plugins/ant/src/com/intellij/lang/ant/misc/PsiReferenceListSpinAllocator.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.misc; import com.intellij.psi.PsiReference; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntAllTasksContainer.java similarity index 68% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/psi/AntAllTasksContainer.java index f044a3bc10..d441b98958 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntAllTasksContainer.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package com.intellij.lang.ant.psi; /** - * @author dyoma + * An element which can contain all tasks as nested elements and nothing else. + * Is used to wrap the Sequential and Parallel tasks. */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface AntAllTasksContainer extends AntTask { } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntAnt.java similarity index 70% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/psi/AntAnt.java index f044a3bc10..acf56fb386 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntAnt.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.lang.ant.psi; -import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.Nullable; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface AntAnt extends AntTask { + + @Nullable + PsiFile getCalledAntFile(); } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntCall.java similarity index 66% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/psi/AntCall.java index f044a3bc10..f6e4b06ef2 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntCall.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.lang.ant.psi; -import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface AntCall extends AntTask { + + @Nullable + AntTarget getTarget(); + + @NotNull + AntProperty[] getParams(); } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntComment.java similarity index 70% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/psi/AntComment.java index f044a3bc10..2e51d731a5 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntComment.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.lang.ant.psi; -import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiComment; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface AntComment extends PsiComment, AntElement { } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntDefTask.java similarity index 71% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/psi/AntDefTask.java index f044a3bc10..784dfbf3ad 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntDefTask.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package com.intellij.lang.ant.psi; /** - * @author dyoma + * @author Eugene Zhuravlev + * Date: Aug 8, 2008 */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface AntDefTask extends AntTask { + void clearClassesCache(); } diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/AntElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntElement.java index 1d77529e2b..f038e2a78c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/AntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntElement.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi; import com.intellij.lang.ant.PsiAntElement; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/AntElementVisitor.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntElementVisitor.java index 1cf0520cbb..08ed7cc083 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/AntElementVisitor.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntElementVisitor.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.psi; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/AntFile.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntFile.java index 450df906eb..3b9664ccbf 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/AntFile.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntFile.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi; import com.intellij.lang.ant.config.impl.AntInstallation; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntFilesProvider.java similarity index 61% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/psi/AntFilesProvider.java index f044a3bc10..6a8df0ee33 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntFilesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.lang.ant.psi; -import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.NotNull; + +import java.io.File; +import java.util.List; +import java.util.Set; /** - * @author dyoma + * @author Eugene Zhuravlev + * Date: May 4, 2007 */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface AntFilesProvider { + + @NotNull + List getFiles(final Set processed); } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntImport.java similarity index 70% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/psi/AntImport.java index f044a3bc10..fa16043b11 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntImport.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.lang.ant.psi; -import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.Nullable; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface AntImport extends AntTask { + + @Nullable + String getFileName(); + + @Nullable + AntFile getImportedFile(); } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntMacroDef.java similarity index 70% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/psi/AntMacroDef.java index f044a3bc10..5e70f756ca 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntMacroDef.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.lang.ant.psi; -import com.intellij.psi.PsiElement; +import com.intellij.lang.ant.psi.introspection.AntTypeDefinition; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface AntMacroDef extends AntDefTask { + AntTypeDefinition getMacroDefinition(); } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntNameIdentifier.java similarity index 58% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/psi/AntNameIdentifier.java index f044a3bc10..a4a36a36f5 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntNameIdentifier.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.lang.ant.psi; -import com.intellij.psi.PsiElement; +import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.NotNull; /** - * @author dyoma + * @author Eugene Zhuravlev + * Date: Jun 20, 2007 */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface AntNameIdentifier extends AntElement { + String getIdentifierName(); + + void setIdentifierName(@NotNull String name) throws IncorrectOperationException; } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntPresetDef.java similarity index 70% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/psi/AntPresetDef.java index f044a3bc10..de1506005b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntPresetDef.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.lang.ant.psi; -import com.intellij.psi.PsiElement; +import com.intellij.lang.ant.psi.introspection.AntTypeDefinition; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface AntPresetDef extends AntDefTask { + AntTypeDefinition getPresetDefinition(); } diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/AntProject.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntProject.java index b033e5a749..e8c1840a1c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/AntProject.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntProject.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi; import org.jetbrains.annotations.NotNull; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/AntProperty.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntProperty.java index 824c87708e..a1444c9670 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/AntProperty.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntProperty.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi; import com.intellij.lang.properties.psi.PropertiesFile; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntScriptDef.java similarity index 70% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/psi/AntScriptDef.java index f044a3bc10..3524ef0645 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntScriptDef.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.lang.ant.psi; -import com.intellij.psi.PsiElement; +import com.intellij.lang.ant.psi.introspection.AntTypeDefinition; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); -} +public interface AntScriptDef extends AntDefTask { + AntTypeDefinition getScriptDefinition(); +} \ No newline at end of file diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/AntStructuredElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntStructuredElement.java index 1cb89466c9..359b03131a 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/AntStructuredElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntStructuredElement.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi; import com.intellij.lang.ant.psi.introspection.AntTypeDefinition; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/AntTarget.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntTarget.java index 566df97295..171d423d03 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/AntTarget.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntTarget.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi; import org.jetbrains.annotations.NonNls; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntTask.java similarity index 70% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/psi/AntTask.java index f044a3bc10..9d5c0d1c7b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntTask.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.lang.ant.psi; -import com.intellij.psi.PsiElement; +public interface AntTask extends AntStructuredElement { -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); + boolean isMacroDefined(); + + boolean isScriptDefined(); } diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/AntTypeDef.java b/plugins/ant/src/com/intellij/lang/ant/psi/AntTypeDef.java index c056cd550d..6b08310d12 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/AntTypeDef.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/AntTypeDef.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi; import com.intellij.lang.ant.psi.introspection.AntTypeDefinition; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/changes/AntChangeVisitor.java b/plugins/ant/src/com/intellij/lang/ant/psi/changes/AntChangeVisitor.java index f1be77c230..56bf2f28e6 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/changes/AntChangeVisitor.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/changes/AntChangeVisitor.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.changes; import com.intellij.lang.ant.AntSupport; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntAllTasksContainerImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntAllTasksContainerImpl.java index 9c83852452..aee772f42d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntAllTasksContainerImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntAllTasksContainerImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.psi.AntAllTasksContainer; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntAntImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntAntImpl.java index cd94158195..ede2fafcfb 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntAntImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntAntImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.psi.AntAnt; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntBuildNumberImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntBuildNumberImpl.java index 821f3d71bd..b3eb5ba30d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntBuildNumberImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntBuildNumberImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.psi.AntElement; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntCallImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntCallImpl.java index c54204b205..06e923ee3f 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntCallImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntCallImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.psi.*; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntCommentImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntCommentImpl.java index dad70f4ce5..3ae9022ab7 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntCommentImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntCommentImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.psi.AntComment; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntDirSetImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntDirSetImpl.java index 1d93d8955d..23d581fd1c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntDirSetImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntDirSetImpl.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.psi.impl; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntElementFactory.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntElementFactory.java index 237998a7aa..862208e232 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntElementFactory.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntElementFactory.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.psi.AntElement; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntElementImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntElementImpl.java index 3fdb1d307e..8b2964905a 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntElementImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntElementImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.extapi.psi.MetadataPsiElementBase; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntEntityRefImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntEntityRefImpl.java index ed17a2032a..b93c15cf33 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntEntityRefImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntEntityRefImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.misc.PsiReferenceListSpinAllocator; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileImpl.java index fb50e7ba02..7dbc8a0a48 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.extapi.psi.LightPsiFileBase; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileListImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileListImpl.java index 2da7c97fa6..de9af18e09 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileListImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileListImpl.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.psi.impl; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileSetImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileSetImpl.java index af274c3cd4..92ccfbc5ca 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileSetImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileSetImpl.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.psi.impl; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFilesProviderImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFilesProviderImpl.java index 3ea07d1955..4c18be5418 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFilesProviderImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFilesProviderImpl.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.psi.impl; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntImportImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntImportImpl.java index c4046263eb..6c4e00b9d1 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntImportImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntImportImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.AntSupport; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntImportsIndex.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntImportsIndex.java index fee2afb071..d79b9465e1 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntImportsIndex.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntImportsIndex.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.ide.highlighter.XmlFileType; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntIntrospector.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntIntrospector.java index 37a5ae2319..7258ff89b2 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntIntrospector.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntIntrospector.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.psi.impl; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntMacroDefImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntMacroDefImpl.java index c1a46af84a..7fb4463de6 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntMacroDefImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntMacroDefImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.AntElementRole; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntNameIdentifierImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntNameIdentifierImpl.java index b901d84ee9..15ecc3aa49 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntNameIdentifierImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntNameIdentifierImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.psi.AntElement; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntOuterProjectElement.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntOuterProjectElement.java index 4521812a4e..0eb2f9d5e4 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntOuterProjectElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntOuterProjectElement.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.psi.AntFile; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPathImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPathImpl.java index 6b2df24a71..ea170152a7 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPathImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPathImpl.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.psi.impl; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPattern.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPattern.java index b48f5ea509..f23d8b27d6 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPattern.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPattern.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.psi.impl; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPresetDefImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPresetDefImpl.java index 9828a8441a..db3674b34d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPresetDefImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPresetDefImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.psi.AntElementVisitor; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntProjectImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntProjectImpl.java index 49b415182c..48cd312437 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntProjectImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntProjectImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.AntElementRole; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPropertyImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPropertyImpl.java index 5150fbfe22..ac373b1dd9 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPropertyImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntPropertyImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.AntElementRole; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntScriptDefImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntScriptDefImpl.java index 0cf6bb100d..82bc387778 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntScriptDefImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntScriptDefImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.AntElementRole; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntStructuredElementImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntStructuredElementImpl.java index 4a9cb82c78..5b3e92a166 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntStructuredElementImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntStructuredElementImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.config.AntConfigurationBase; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTargetImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTargetImpl.java index 3830004688..c6a409aa5c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTargetImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTargetImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.AntElementRole; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTaskImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTaskImpl.java index 7e52eb583f..8fb4449512 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTaskImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTaskImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.AntElementRole; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTimestampFormatImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTimestampFormatImpl.java index 4a86ccf5c4..5c1bf0954d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTimestampFormatImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTimestampFormatImpl.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.psi.impl; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTypeDefImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTypeDefImpl.java index e62a0c78eb..751b9c363b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTypeDefImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntTypeDefImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl; import com.intellij.lang.ant.config.impl.AntResourcesClassLoader; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/PropertiesBuilder.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/PropertiesBuilder.java index 5a143045c5..3dfe7fe289 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/PropertiesBuilder.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/PropertiesBuilder.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.psi.impl; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntAttributeReference.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntAttributeReference.java index 25321d9210..578ef2bea5 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntAttributeReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntAttributeReference.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference; import com.intellij.lang.ant.psi.AntStructuredElement; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntElementCompletionWrapper.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntElementCompletionWrapper.java index d6eb0edb63..443167e0fe 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntElementCompletionWrapper.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntElementCompletionWrapper.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference; import com.intellij.lang.ant.AntElementRole; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntElementNameReference.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntElementNameReference.java index 1e34524ce0..c20fad2037 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntElementNameReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntElementNameReference.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference; import com.intellij.lang.ant.AntElementRole; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntEndElementNameReference.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntEndElementNameReference.java index bce7fd8963..cf3d1e20b4 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntEndElementNameReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntEndElementNameReference.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference; import com.intellij.codeInsight.lookup.AutoCompletionPolicy; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntEntityReference.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntEntityReference.java index a7d9f85c0b..3587b5e64e 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntEntityReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntEntityReference.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference; import com.intellij.lang.ant.psi.AntElement; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntFileReference.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntFileReference.java index 37e99c9145..e6311dc6ed 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntFileReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntFileReference.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference; import com.intellij.codeInsight.intention.IntentionAction; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntFileReferenceSet.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntFileReferenceSet.java index 486662f9f5..0bfe906771 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntFileReferenceSet.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntFileReferenceSet.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference; import com.intellij.lang.ant.psi.*; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntGenericReference.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntGenericReference.java index 243c1c73f8..b34e823a8d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntGenericReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntGenericReference.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference; import com.intellij.codeInsight.CodeInsightBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntMacroDefParameterReference.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntMacroDefParameterReference.java index 8d612fc285..e9875c15a2 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntMacroDefParameterReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntMacroDefParameterReference.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference; import com.intellij.lang.ant.psi.AntAllTasksContainer; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntPropertyReference.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntPropertyReference.java index 0ec56555fa..b3427d0320 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntPropertyReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntPropertyReference.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference; import com.intellij.codeInsight.intention.IntentionAction; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntRefIdReference.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntRefIdReference.java index 5f577c1adf..64981f1b74 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntRefIdReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntRefIdReference.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/devkit/src/util/ActionData.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntReference.java similarity index 61% copy from plugins/devkit/src/util/ActionData.java copy to plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntReference.java index 04c436af9c..e45d4d61cb 100644 --- a/plugins/devkit/src/util/ActionData.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. @@ -13,34 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.idea.devkit.util; +package com.intellij.lang.ant.psi.impl.reference; -import org.jetbrains.annotations.Nullable; +import com.intellij.codeInsight.intention.IntentionAction; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; -/** - * @author swr - */ -public interface ActionData { - @NotNull - String getActionId(); - - @NotNull - String getActionText(); - - String getActionDescription(); +public interface AntReference { - @Nullable - String getSelectedGroupId(); + boolean shouldBeSkippedByAnnotator(); - @Nullable - String getSelectedActionId(); + void setShouldBeSkippedByAnnotator(boolean value); - String getSelectedAnchor(); + String getUnresolvedMessagePattern(); - @Nullable - String getFirstKeyStroke(); + @NotNull + IntentionAction[] getFixes(); @Nullable - String getSecondKeyStroke(); + String getCanonicalRepresentationText(); } diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntReferenceProvidersRegistry.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntReferenceProvidersRegistry.java index 8562a2494b..191970c043 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntReferenceProvidersRegistry.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntReferenceProvidersRegistry.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference; import com.intellij.lang.ant.psi.AntElement; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntTargetReference.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntTargetReference.java index 102f6956eb..ffe35c3597 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntTargetReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntTargetReference.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference; import com.intellij.codeInsight.intention.IntentionAction; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntAttributeReferenceProvider.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntAttributeReferenceProvider.java index 62cfd03140..fc7d5a81c2 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntAttributeReferenceProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntAttributeReferenceProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference.providers; import com.intellij.lang.ant.misc.PsiReferenceListSpinAllocator; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntElementNameReferenceProvider.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntElementNameReferenceProvider.java index 200e9a1df6..fa97ddba85 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntElementNameReferenceProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntElementNameReferenceProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference.providers; import com.intellij.lang.ant.misc.PsiReferenceListSpinAllocator; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntFileReferenceProvider.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntFileReferenceProvider.java index 4751c4fe05..a9918a2b89 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntFileReferenceProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntFileReferenceProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference.providers; import com.intellij.lang.ant.psi.AntStructuredElement; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntMacroDefParameterReferenceProvider.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntMacroDefParameterReferenceProvider.java index fdd8618a38..5663a5cd66 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntMacroDefParameterReferenceProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntMacroDefParameterReferenceProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference.providers; import com.intellij.lang.ant.misc.PsiReferenceListSpinAllocator; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntPropertyReferenceProvider.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntPropertyReferenceProvider.java index 014386eb2c..dff6aab183 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntPropertyReferenceProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntPropertyReferenceProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference.providers; import com.intellij.lang.ant.AntBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntRefIdReferenceProvider.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntRefIdReferenceProvider.java index 65c9ba18fc..80896280c9 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntRefIdReferenceProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntRefIdReferenceProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference.providers; import com.intellij.lang.ant.psi.AntStructuredElement; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntSingleTargetReferenceProvider.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntSingleTargetReferenceProvider.java index 8dd5bf29dd..43757b85e2 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntSingleTargetReferenceProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntSingleTargetReferenceProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference.providers; import com.intellij.lang.ant.psi.AntElement; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntTargetListReferenceProvider.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntTargetListReferenceProvider.java index 2e786b6ddd..79b0a453e0 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntTargetListReferenceProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/providers/AntTargetListReferenceProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.impl.reference.providers; import com.intellij.lang.ant.misc.PsiReferenceListSpinAllocator; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/introspection/AntAttributeType.java b/plugins/ant/src/com/intellij/lang/ant/psi/introspection/AntAttributeType.java index a90a85e50a..8bf1b9b275 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/introspection/AntAttributeType.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/introspection/AntAttributeType.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.introspection; import org.apache.tools.ant.types.Reference; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/introspection/AntTypeDefinition.java b/plugins/ant/src/com/intellij/lang/ant/psi/introspection/AntTypeDefinition.java index c1d96f4677..b065c3c2b2 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/introspection/AntTypeDefinition.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/introspection/AntTypeDefinition.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.introspection; import com.intellij.psi.PsiElement; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/introspection/AntTypeId.java b/plugins/ant/src/com/intellij/lang/ant/psi/introspection/AntTypeId.java index ad560f195d..80889b704b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/introspection/AntTypeId.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/introspection/AntTypeId.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.introspection; import com.intellij.lang.ant.misc.AntStringInterner; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/introspection/impl/AntTypeDefinitionImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/introspection/impl/AntTypeDefinitionImpl.java index 54c3cf134d..a48f2042eb 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/introspection/impl/AntTypeDefinitionImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/introspection/impl/AntTypeDefinitionImpl.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.introspection.impl; import com.intellij.lang.ant.misc.AntStringInterner; diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/usages/AntUsagesProvider.java b/plugins/ant/src/com/intellij/lang/ant/psi/usages/AntUsagesProvider.java index cb64fde621..a5912c62f5 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/usages/AntUsagesProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/usages/AntUsagesProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.psi.usages; import com.intellij.lang.ant.HelpID; diff --git a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntChangeContextFix.java b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntChangeContextFix.java index 02c2621575..93fc48ac15 100644 --- a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntChangeContextFix.java +++ b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntChangeContextFix.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.quickfix; import com.intellij.codeInsight.daemon.impl.HectorComponent; diff --git a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreateMacroDefFix.java b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreateMacroDefFix.java index b2e36385e9..8d87309d4b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreateMacroDefFix.java +++ b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreateMacroDefFix.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.quickfix; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; diff --git a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreatePresetDefFix.java b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreatePresetDefFix.java index 3c6c37457a..8250adfc67 100644 --- a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreatePresetDefFix.java +++ b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreatePresetDefFix.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.quickfix; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; diff --git a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreatePropertyFix.java b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreatePropertyFix.java index 9ee108f0fb..ec5b6b22f6 100644 --- a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreatePropertyFix.java +++ b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreatePropertyFix.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.quickfix; import com.intellij.codeInsight.CodeInsightUtilBase; diff --git a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreateTargetFix.java b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreateTargetFix.java index 26a8f57e48..7e848276d0 100644 --- a/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreateTargetFix.java +++ b/plugins/ant/src/com/intellij/lang/ant/quickfix/AntCreateTargetFix.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.quickfix; import com.intellij.codeInsight.intention.impl.BaseIntentionAction; diff --git a/plugins/ant/src/com/intellij/lang/ant/refactoring/AntRenameHandler.java b/plugins/ant/src/com/intellij/lang/ant/refactoring/AntRenameHandler.java index 08f96942de..280631d947 100644 --- a/plugins/ant/src/com/intellij/lang/ant/refactoring/AntRenameHandler.java +++ b/plugins/ant/src/com/intellij/lang/ant/refactoring/AntRenameHandler.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.refactoring; diff --git a/plugins/ant/src/com/intellij/lang/ant/refactoring/AntTargetRenameListenerProvider.java b/plugins/ant/src/com/intellij/lang/ant/refactoring/AntTargetRenameListenerProvider.java index 58c5ecfc3e..69f318afa9 100644 --- a/plugins/ant/src/com/intellij/lang/ant/refactoring/AntTargetRenameListenerProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/refactoring/AntTargetRenameListenerProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.refactoring; import com.intellij.execution.BeforeRunTaskProvider; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/ant/src/com/intellij/lang/ant/refactoring/AntVetoRenameCondition.java similarity index 61% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/ant/src/com/intellij/lang/ant/refactoring/AntVetoRenameCondition.java index f044a3bc10..fa9cd43cd4 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/ant/src/com/intellij/lang/ant/refactoring/AntVetoRenameCondition.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.lang.ant.refactoring; +import com.intellij.openapi.util.Condition; import com.intellij.psi.PsiElement; +import com.intellij.lang.ant.PsiAntElement; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class AntVetoRenameCondition implements Condition { + public boolean value(final PsiElement element) { + return element instanceof PsiAntElement && !((PsiAntElement)element).canRename(); + } } diff --git a/plugins/ant/src/com/intellij/lang/ant/resources/AntActionsBundle.java b/plugins/ant/src/com/intellij/lang/ant/resources/AntActionsBundle.java index 041f2e80f4..33872e16b5 100644 --- a/plugins/ant/src/com/intellij/lang/ant/resources/AntActionsBundle.java +++ b/plugins/ant/src/com/intellij/lang/ant/resources/AntActionsBundle.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.resources; import com.intellij.CommonBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/validation/AntAnnotator.java b/plugins/ant/src/com/intellij/lang/ant/validation/AntAnnotator.java index 961c1a9fc9..483ac63cbe 100644 --- a/plugins/ant/src/com/intellij/lang/ant/validation/AntAnnotator.java +++ b/plugins/ant/src/com/intellij/lang/ant/validation/AntAnnotator.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.validation; import com.intellij.codeInsight.intention.IntentionAction; diff --git a/plugins/ant/src/com/intellij/lang/ant/validation/AntDuplicateImportedTargetsInspection.java b/plugins/ant/src/com/intellij/lang/ant/validation/AntDuplicateImportedTargetsInspection.java index d4849236a6..3b0766b2be 100644 --- a/plugins/ant/src/com/intellij/lang/ant/validation/AntDuplicateImportedTargetsInspection.java +++ b/plugins/ant/src/com/intellij/lang/ant/validation/AntDuplicateImportedTargetsInspection.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.validation; import com.intellij.codeHighlighting.HighlightDisplayLevel; diff --git a/plugins/ant/src/com/intellij/lang/ant/validation/AntDuplicateTargetsInspection.java b/plugins/ant/src/com/intellij/lang/ant/validation/AntDuplicateTargetsInspection.java index eecb087c15..c5024eb797 100644 --- a/plugins/ant/src/com/intellij/lang/ant/validation/AntDuplicateTargetsInspection.java +++ b/plugins/ant/src/com/intellij/lang/ant/validation/AntDuplicateTargetsInspection.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.validation; import com.intellij.codeInspection.InspectionManager; diff --git a/plugins/ant/src/com/intellij/lang/ant/validation/AntHectorConfigurable.java b/plugins/ant/src/com/intellij/lang/ant/validation/AntHectorConfigurable.java index 0ef03d0ea0..da2354d44b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/validation/AntHectorConfigurable.java +++ b/plugins/ant/src/com/intellij/lang/ant/validation/AntHectorConfigurable.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.validation; import com.intellij.lang.ant.AntSupport; diff --git a/plugins/ant/src/com/intellij/lang/ant/validation/AntHectorPanelProvider.java b/plugins/ant/src/com/intellij/lang/ant/validation/AntHectorPanelProvider.java index a19243cc74..ba70296f73 100644 --- a/plugins/ant/src/com/intellij/lang/ant/validation/AntHectorPanelProvider.java +++ b/plugins/ant/src/com/intellij/lang/ant/validation/AntHectorPanelProvider.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.validation; import com.intellij.lang.ant.AntSupport; diff --git a/plugins/ant/src/com/intellij/lang/ant/validation/AntInspection.java b/plugins/ant/src/com/intellij/lang/ant/validation/AntInspection.java index d868bf4d08..60114aab06 100644 --- a/plugins/ant/src/com/intellij/lang/ant/validation/AntInspection.java +++ b/plugins/ant/src/com/intellij/lang/ant/validation/AntInspection.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.validation; import com.intellij.codeHighlighting.HighlightDisplayLevel; diff --git a/plugins/ant/src/com/intellij/lang/ant/validation/AntMissingPropertiesFileInspection.java b/plugins/ant/src/com/intellij/lang/ant/validation/AntMissingPropertiesFileInspection.java index ab9c849298..fe320d431a 100644 --- a/plugins/ant/src/com/intellij/lang/ant/validation/AntMissingPropertiesFileInspection.java +++ b/plugins/ant/src/com/intellij/lang/ant/validation/AntMissingPropertiesFileInspection.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant.validation; import com.intellij.codeInspection.InspectionManager; diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntCompletionTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntCompletionTest.java index 23b0fb1f5f..85cfb65bd4 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/AntCompletionTest.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntCompletionTest.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant; import com.intellij.codeInsight.completion.CodeCompletionHandlerBase; diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntHighlightingTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntHighlightingTest.java index b02564799e..e0d664df7a 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/AntHighlightingTest.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntHighlightingTest.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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. */ /* diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntMultiFileCompletionTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntMultiFileCompletionTest.java index 8ded6483f0..27a281ed3a 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/AntMultiFileCompletionTest.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntMultiFileCompletionTest.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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. */ /* diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntParsingTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntParsingTest.java index 106c74e064..d7066511bc 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/AntParsingTest.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntParsingTest.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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.lang.ant; diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntRenameTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntRenameTest.java index 0a0dcf051a..b253879ff7 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/AntRenameTest.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntRenameTest.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant; import com.intellij.codeInsight.TargetElementUtilBase; diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/AntResolveTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/AntResolveTest.java index a09cdf20a4..f72bf9de65 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/AntResolveTest.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/AntResolveTest.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant; import com.intellij.lang.ant.config.AntConfigurationBase; diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/CustomTypesTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/CustomTypesTest.java index a5952ada3b..e164c87b1f 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/CustomTypesTest.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/CustomTypesTest.java @@ -1,3 +1,18 @@ +/* + * 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.lang.ant; import com.intellij.lang.ant.psi.AntFile; diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/psi/impl/PatternsTest.java b/plugins/ant/tests/src/com/intellij/lang/ant/psi/impl/PatternsTest.java index 1cb7376040..0942f62641 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/psi/impl/PatternsTest.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/psi/impl/PatternsTest.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.lang.ant.psi.impl; diff --git a/plugins/ant/tests/src/com/intellij/lang/ant/typedefs/AntCustomTask.java b/plugins/ant/tests/src/com/intellij/lang/ant/typedefs/AntCustomTask.java index 324b268347..1fe324bd12 100644 --- a/plugins/ant/tests/src/com/intellij/lang/ant/typedefs/AntCustomTask.java +++ b/plugins/ant/tests/src/com/intellij/lang/ant/typedefs/AntCustomTask.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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.lang.ant.typedefs; diff --git a/plugins/commander/src/com/intellij/ide/actions/CommanderViewActionGroup.java b/plugins/commander/src/com/intellij/ide/actions/CommanderViewActionGroup.java index bd17711ab8..16956d85f9 100644 --- a/plugins/commander/src/com/intellij/ide/actions/CommanderViewActionGroup.java +++ b/plugins/commander/src/com/intellij/ide/actions/CommanderViewActionGroup.java @@ -1,3 +1,18 @@ +/* + * 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.ide.actions; import com.intellij.openapi.actionSystem.AnActionEvent; diff --git a/plugins/commander/src/com/intellij/ide/actions/SwapPanelsAction.java b/plugins/commander/src/com/intellij/ide/actions/SwapPanelsAction.java index 4aa4971a50..b6eb908b64 100644 --- a/plugins/commander/src/com/intellij/ide/actions/SwapPanelsAction.java +++ b/plugins/commander/src/com/intellij/ide/actions/SwapPanelsAction.java @@ -1,4 +1,19 @@ +/* + * 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.ide.actions; import com.intellij.ide.commander.Commander; diff --git a/plugins/commander/src/com/intellij/ide/actions/SyncViewsAction.java b/plugins/commander/src/com/intellij/ide/actions/SyncViewsAction.java index 64e8dde121..ffe2dab7fd 100644 --- a/plugins/commander/src/com/intellij/ide/actions/SyncViewsAction.java +++ b/plugins/commander/src/com/intellij/ide/actions/SyncViewsAction.java @@ -1,4 +1,19 @@ +/* + * 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.ide.actions; import com.intellij.ide.commander.Commander; diff --git a/plugins/commander/src/com/intellij/ide/commander/Commander.java b/plugins/commander/src/com/intellij/ide/commander/Commander.java index 70b1e21b84..d500062aa1 100644 --- a/plugins/commander/src/com/intellij/ide/commander/Commander.java +++ b/plugins/commander/src/com/intellij/ide/commander/Commander.java @@ -1,3 +1,18 @@ +/* + * 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.ide.commander; import com.intellij.ide.PsiCopyPasteManager; diff --git a/plugins/commander/src/com/intellij/ide/commander/CommanderHistory.java b/plugins/commander/src/com/intellij/ide/commander/CommanderHistory.java index 2f9ab25eb8..f1fdfbe087 100644 --- a/plugins/commander/src/com/intellij/ide/commander/CommanderHistory.java +++ b/plugins/commander/src/com/intellij/ide/commander/CommanderHistory.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.ide.commander; diff --git a/plugins/commander/src/com/intellij/ide/commander/CommanderSelectInTarget.java b/plugins/commander/src/com/intellij/ide/commander/CommanderSelectInTarget.java index 3fa4901c8a..59bf7427a5 100644 --- a/plugins/commander/src/com/intellij/ide/commander/CommanderSelectInTarget.java +++ b/plugins/commander/src/com/intellij/ide/commander/CommanderSelectInTarget.java @@ -1,3 +1,18 @@ +/* + * 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.ide.commander; import com.intellij.ide.SelectInManager; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildFile.java b/plugins/commander/src/com/intellij/ide/commander/CommanderToolWindowFactory.java similarity index 51% copy from plugins/ant/src/com/intellij/lang/ant/config/AntBuildFile.java copy to plugins/commander/src/com/intellij/ide/commander/CommanderToolWindowFactory.java index 0e03ae4ade..1449ed0d32 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildFile.java +++ b/plugins/commander/src/com/intellij/ide/commander/CommanderToolWindowFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,34 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.ide.commander; -package com.intellij.lang.ant.config; - +import com.intellij.openapi.wm.ToolWindowFactory; +import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.project.Project; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.PsiFile; -import org.jetbrains.annotations.Nullable; - -public interface AntBuildFile { - @Nullable - String getPresentableName(); - - @Nullable - String getName(); - - AntBuildModel getModel(); - - PsiFile getAntFile(); +import com.intellij.ui.content.ContentFactory; - Project getProject(); - - @Nullable - VirtualFile getVirtualFile(); - - @Nullable - String getPresentableUrl(); - - boolean isTargetVisible(final AntBuildTarget target); - - boolean exists(); +/** + * @author yole + */ +public class CommanderToolWindowFactory implements ToolWindowFactory { + public void createToolWindowContent(Project project, ToolWindow toolWindow) { + Commander commander = Commander.getInstance(project); + toolWindow.getContentManager().addContent(ContentFactory.SERVICE.getInstance().createContent(commander, "", false)); + } } diff --git a/plugins/commander/src/com/intellij/ide/commander/PsiDiffContentFactory.java b/plugins/commander/src/com/intellij/ide/commander/PsiDiffContentFactory.java index f04727e7cf..b64d2d23c1 100644 --- a/plugins/commander/src/com/intellij/ide/commander/PsiDiffContentFactory.java +++ b/plugins/commander/src/com/intellij/ide/commander/PsiDiffContentFactory.java @@ -1,3 +1,18 @@ +/* + * 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.ide.commander; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightManager.java b/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightManager.java index e2a84909c7..e0de196b7c 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightManager.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightManager.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightProfile.java b/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightProfile.java index 3ce06eb1a0..570043745d 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightProfile.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightProfile.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightUpdaters.java similarity index 55% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightUpdaters.java index f044a3bc10..ca2011bdbe 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/CopyrightUpdaters.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.maddyhome.idea.copyright; -import com.intellij.psi.PsiElement; +import com.intellij.openapi.fileTypes.FileTypeExtension; +import com.maddyhome.idea.copyright.psi.UpdateCopyrightInstanceFactory; /** - * @author dyoma + * @author yole */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class CopyrightUpdaters extends FileTypeExtension { + public static CopyrightUpdaters INSTANCE = new CopyrightUpdaters(); + + private CopyrightUpdaters() { + super("com.intellij.copyright.updaters"); + } } diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/AbstractFileProcessor.java b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/AbstractFileProcessor.java index dc90265c98..6ed8b280e9 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/AbstractFileProcessor.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/AbstractFileProcessor.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.actions; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/GenerateCopyrightAction.java b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/GenerateCopyrightAction.java index 15efe9bebb..a647c10706 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/GenerateCopyrightAction.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/GenerateCopyrightAction.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.actions; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/RecursionDlg.java b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/RecursionDlg.java index c7eb6cc334..3898c90c4b 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/RecursionDlg.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/RecursionDlg.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.actions; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightAction.java b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightAction.java index 360f60d732..7f25e97ae1 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightAction.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightAction.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.actions; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightCheckinHandlerFactory.java b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightCheckinHandlerFactory.java index 02e5dc32c8..7a6d686b9d 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightCheckinHandlerFactory.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightCheckinHandlerFactory.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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. */ /* diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightCheckinHandlerState.java b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightCheckinHandlerState.java index 5f46aee99e..0a2039e458 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightCheckinHandlerState.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightCheckinHandlerState.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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. */ /* diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightProcessor.java b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightProcessor.java index cd21642137..2990ca886e 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightProcessor.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/actions/UpdateCopyrightProcessor.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.actions; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/options/ExternalOptionHelper.java b/plugins/copyright/src/com/maddyhome/idea/copyright/options/ExternalOptionHelper.java index 3b4f5f8337..e0783eb7fe 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/options/ExternalOptionHelper.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/options/ExternalOptionHelper.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.options; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/copyright/src/com/maddyhome/idea/copyright/options/JavaOptions.java similarity index 70% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/copyright/src/com/maddyhome/idea/copyright/options/JavaOptions.java index f044a3bc10..fdc0af398a 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/options/JavaOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; -import com.intellij.psi.PsiElement; +package com.maddyhome.idea.copyright.options; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); -} +public interface JavaOptions +{ + int LOCATION_BEFORE_PACKAGE = 1; + int LOCATION_BEFORE_IMPORT = 2; + int LOCATION_BEFORE_CLASS = 3; +} \ No newline at end of file diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/options/LanguageOptions.java b/plugins/copyright/src/com/maddyhome/idea/copyright/options/LanguageOptions.java index abd3c0c1d8..6e7f336544 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/options/LanguageOptions.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/options/LanguageOptions.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.options; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/options/Options.java b/plugins/copyright/src/com/maddyhome/idea/copyright/options/Options.java index 681fcd1fe0..b735e063c0 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/options/Options.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/options/Options.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.options; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/copyright/src/com/maddyhome/idea/copyright/options/XmlOptions.java similarity index 71% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/copyright/src/com/maddyhome/idea/copyright/options/XmlOptions.java index f044a3bc10..adb81cfeaf 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/options/XmlOptions.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; -import com.intellij.psi.PsiElement; +package com.maddyhome.idea.copyright.options; /** - * @author dyoma */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); -} +public interface XmlOptions +{ + int LOCATION_BEFORE_DOCTYPE = 1; + int LOCATION_BEFORE_ROOTTAG = 2; +} \ No newline at end of file diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/DateInfo.java b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/DateInfo.java index 9d3c0724ec..e17b81c163 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/DateInfo.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/DateInfo.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.pattern; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/EntityUtil.java b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/EntityUtil.java index d7c0d29d83..edad057990 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/EntityUtil.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/EntityUtil.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.pattern; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/FileInfo.java b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/FileInfo.java index cd0867a2be..f5cf378955 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/FileInfo.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/FileInfo.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.pattern; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/FileUtil.java b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/FileUtil.java index fcc68fcfbb..ff8cb7f1d0 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/FileUtil.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/FileUtil.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.pattern; diff --git a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/ModuleInfo.java similarity index 62% copy from plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java copy to plugins/copyright/src/com/maddyhome/idea/copyright/pattern/ModuleInfo.java index 5ef412416e..f95003d4c8 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/ModuleInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,12 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.cvsIntegration; +package com.maddyhome.idea.copyright.pattern; -public interface DateOrRevision { - public String getBranch(); - public boolean shouldUseBranch(); - public String getDate(); - public boolean shouldUseDate(); -} +import com.intellij.openapi.module.Module; + +public class ModuleInfo +{ + public ModuleInfo(Module module) + { + name = module.getName(); + } + + public String getName() + { + return name; + } + + private final String name; +} \ No newline at end of file diff --git a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/ProjectInfo.java similarity index 62% copy from plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java copy to plugins/copyright/src/com/maddyhome/idea/copyright/pattern/ProjectInfo.java index 5ef412416e..97aaed13ef 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/ProjectInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,12 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.cvsIntegration; +package com.maddyhome.idea.copyright.pattern; -public interface DateOrRevision { - public String getBranch(); - public boolean shouldUseBranch(); - public String getDate(); - public boolean shouldUseDate(); -} +import com.intellij.openapi.project.Project; + +public class ProjectInfo +{ + public ProjectInfo(Project project) + { + name = project.getName(); + } + + public String getName() + { + return name; + } + + private final String name; +} \ No newline at end of file diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/VelocityHelper.java b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/VelocityHelper.java index 417d20e4f2..bbf5ac8762 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/VelocityHelper.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/pattern/VelocityHelper.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.pattern; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/AbstractUpdateCopyright.java b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/AbstractUpdateCopyright.java index 04feb69ad6..a912b3f12f 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/AbstractUpdateCopyright.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/AbstractUpdateCopyright.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.psi; diff --git a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyright.java similarity index 62% copy from plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java copy to plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyright.java index 5ef412416e..8df7d9f0c3 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyright.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,12 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.cvsIntegration; +package com.maddyhome.idea.copyright.psi; -public interface DateOrRevision { - public String getBranch(); - public boolean shouldUseBranch(); - public String getDate(); - public boolean shouldUseDate(); -} +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.IncorrectOperationException; + +public interface UpdateCopyright +{ + void prepare(); + + void complete() throws IncorrectOperationException, Exception; + + VirtualFile getRoot(); +} \ No newline at end of file diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyrightFactory.java b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyrightFactory.java index 76caa22556..5319c5a18e 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyrightFactory.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyrightFactory.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.psi; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildFile.java b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyrightInstanceFactory.java similarity index 56% copy from plugins/ant/src/com/intellij/lang/ant/config/AntBuildFile.java copy to plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyrightInstanceFactory.java index 0e03ae4ade..3cb85a3032 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildFile.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateCopyrightInstanceFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,34 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.intellij.lang.ant.config; +package com.maddyhome.idea.copyright.psi; import com.intellij.openapi.project.Project; +import com.intellij.openapi.module.Module; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.PsiFile; -import org.jetbrains.annotations.Nullable; - -public interface AntBuildFile { - @Nullable - String getPresentableName(); - - @Nullable - String getName(); - - AntBuildModel getModel(); - - PsiFile getAntFile(); +import com.intellij.openapi.fileTypes.FileType; +import com.maddyhome.idea.copyright.CopyrightProfile; - Project getProject(); - - @Nullable - VirtualFile getVirtualFile(); - - @Nullable - String getPresentableUrl(); - - boolean isTargetVisible(final AntBuildTarget target); - - boolean exists(); +/** + * @author yole + */ +public interface UpdateCopyrightInstanceFactory { + UpdateCopyright createInstance(Project project, Module module, VirtualFile file, + FileType base, CopyrightProfile options); } diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJavaFileCopyright.java b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJavaFileCopyright.java index cea21f07ec..84bf5b60cf 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJavaFileCopyright.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJavaFileCopyright.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.psi; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJavaScriptFileCopyright.java b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJavaScriptFileCopyright.java index 1889002515..ce66457527 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJavaScriptFileCopyright.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJavaScriptFileCopyright.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.psi; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJspFileCopyright.java b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJspFileCopyright.java index 9779890f27..06978d2f70 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJspFileCopyright.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJspFileCopyright.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.psi; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJspxFileCopyright.java b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJspxFileCopyright.java index 7af3e9a889..a5d2a4fcbd 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJspxFileCopyright.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJspxFileCopyright.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.psi; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePropertiesFileCopyright.java b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePropertiesFileCopyright.java index a236d16c51..231b5cdacf 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePropertiesFileCopyright.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePropertiesFileCopyright.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.psi; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePsiFileCopyright.java b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePsiFileCopyright.java index 457eb20d3d..2948457d36 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePsiFileCopyright.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdatePsiFileCopyright.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.psi; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateXmlFileCopyright.java b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateXmlFileCopyright.java index 45022b27ac..e5bd9a12ef 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateXmlFileCopyright.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateXmlFileCopyright.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.psi; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightConfigurable.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightConfigurable.java index e90756aa88..6631faaef9 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightConfigurable.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightConfigurable.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.ui; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java index a8297f46d7..c8af799cb1 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightFormattingConfigurable.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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. */ /* diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java index 65e7c6825a..0d60a03666 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.ui; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java index 1ec1e391bf..2d5626c824 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProjectConfigurable.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.ui; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/FileTypeCopyrightConfigurableFactory.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/FileTypeCopyrightConfigurableFactory.java index e9a8a28950..31de428682 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/FileTypeCopyrightConfigurableFactory.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/FileTypeCopyrightConfigurableFactory.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.ui; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/IntegerTextField.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/IntegerTextField.java index 109d7a8374..af4ca88c2d 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/IntegerTextField.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/IntegerTextField.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.ui; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java index 74d2f85a11..64791592ca 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/ProjectSettingsPanel.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.ui; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.java index f180401b52..338b91f5a7 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateCommentPanel.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.ui; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateOptionsPanelListener.java similarity index 70% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateOptionsPanelListener.java index f044a3bc10..f338ad6ee1 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/TemplateOptionsPanelListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; -import com.intellij.psi.PsiElement; +package com.maddyhome.idea.copyright.ui; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +import java.util.EventListener; + +public interface TemplateOptionsPanelListener extends EventListener +{ + void optionChanged(); } diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java b/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java index fa954789b7..87c01b2e39 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.util; diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/util/NewFileTracker.java b/plugins/copyright/src/com/maddyhome/idea/copyright/util/NewFileTracker.java index 17a242c5e6..53d4452cb7 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/util/NewFileTracker.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/util/NewFileTracker.java @@ -1,17 +1,17 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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 + * 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 + * 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. + * 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.maddyhome.idea.copyright.util; diff --git a/plugins/cvs/cvs-core/src/com/intellij/CvsBundle.java b/plugins/cvs/cvs-core/src/com/intellij/CvsBundle.java index ea4f4d0d8b..21ada03b88 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/CvsBundle.java +++ b/plugins/cvs/cvs-core/src/com/intellij/CvsBundle.java @@ -1,5 +1,5 @@ -package com.intellij;/* - * Copyright 2000-2005 JetBrains s.r.o. +/* + * 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. @@ -13,8 +13,7 @@ package com.intellij;/* * See the License for the specific language governing permissions and * limitations under the License. */ - -import org.jetbrains.annotations.NonNls; +package com.intellij;import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.PropertyKey; import java.lang.ref.Reference; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/Progress.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/Progress.java index d1121236a8..a4e65bac99 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/Progress.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/Progress.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2; import com.intellij.openapi.progress.ProgressIndicator; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/DateOrRevisionSettings.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/DateOrRevisionSettings.java index f9f8954ee6..3e52843e1c 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/DateOrRevisionSettings.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/DateOrRevisionSettings.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config; import com.intellij.openapi.cvsIntegration.DateOrRevision; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/ExtConfiguration.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/ExtConfiguration.java index 35e847ac6e..f0285facb1 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/ExtConfiguration.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/ExtConfiguration.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config; import com.intellij.cvsSupport2.connections.ext.ExtConnection; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/LocalSettings.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/LocalSettings.java index 0a80bc7fb4..823839e4b9 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/LocalSettings.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/LocalSettings.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/ProxySettings.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/ProxySettings.java index 084e40af45..9011ccdced 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/ProxySettings.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/ProxySettings.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/SshSettings.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/SshSettings.java index 446d7cb7f2..6387ebbfda 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/SshSettings.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/config/SshSettings.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config; import com.intellij.cvsSupport2.connections.ssh.SshTypesToUse; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionOnProcess.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionOnProcess.java index 97904d331a..7cf272c64a 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionOnProcess.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionOnProcess.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections; import com.intellij.cvsSupport2.errorHandling.ErrorRegistry; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionSettingsImpl.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionSettingsImpl.java index 7fe5c2ca54..abbe02fe6d 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionSettingsImpl.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ConnectionSettingsImpl.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections; import com.intellij.cvsSupport2.connections.ssh.SshProxyFactory; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsConnectionUtil.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsConnectionUtil.java index 4e8a0621cd..98e2906983 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsConnectionUtil.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsConnectionUtil.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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.cvsSupport2.connections; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsEnvironment.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsEnvironment.java index 3d19efba01..36a1497113 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsEnvironment.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsEnvironment.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections; import com.intellij.cvsSupport2.connections.login.CvsLoginWorker; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsMethod.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsMethod.java index 81f6cac5bc..a91fa78852 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsMethod.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsMethod.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections; import com.intellij.openapi.util.Comparing; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsRootData.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsRootData.java index 4e9c5b3542..a6f332ecd9 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsRootData.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsRootData.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections; import com.intellij.openapi.util.Comparing; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsRootParser.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsRootParser.java index 395e8b8880..e2202ad06d 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsRootParser.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsRootParser.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsRootSettingsBuilder.java similarity index 66% copy from plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java copy to plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsRootSettingsBuilder.java index 5ef412416e..0ea9053a8e 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsRootSettingsBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.cvsIntegration; +package com.intellij.cvsSupport2.connections; -public interface DateOrRevision { - public String getBranch(); - public boolean shouldUseBranch(); - public String getDate(); - public boolean shouldUseDate(); +public interface CvsRootSettingsBuilder { + Settings createSettings(CvsMethod method, final String cvsRootAsString); + String getPServerPassword(final String cvsRoot); } + diff --git a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsSettings.java similarity index 62% copy from plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java copy to plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsSettings.java index 5ef412416e..6d5cd60ba5 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/CvsSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.cvsIntegration; +package com.intellij.cvsSupport2.connections; -public interface DateOrRevision { - public String getBranch(); - public boolean shouldUseBranch(); - public String getDate(); - public boolean shouldUseDate(); +public interface CvsSettings { + void setPassword(String password); + void setHost(String host); + void setPort(int port); + void setUser(String user); + void setRepository(String repository); + void setUseProxy(String proxyHost, String proxyPort); } diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/RootFormatter.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/RootFormatter.java index b2c63fd4ef..0b82feac4b 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/RootFormatter.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/RootFormatter.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ext/ExtConnection.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ext/ExtConnection.java index 15f12e9891..8368a4b1c1 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ext/ExtConnection.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ext/ExtConnection.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ext; import com.intellij.cvsSupport2.config.ExtConfiguration; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/local/LocalConnection.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/local/LocalConnection.java index 5ae0339ac2..48d243fce9 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/local/LocalConnection.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/local/LocalConnection.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.local; import com.intellij.cvsSupport2.config.LocalSettings; diff --git a/plugins/git4idea/src/git4idea/commands/GitHandlerListener.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/login/CvsLoginWorker.java similarity index 52% copy from plugins/git4idea/src/git4idea/commands/GitHandlerListener.java copy to plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/login/CvsLoginWorker.java index d540272d33..4a23a75ecd 100644 --- a/plugins/git4idea/src/git4idea/commands/GitHandlerListener.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/login/CvsLoginWorker.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. @@ -13,26 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package git4idea.commands; +package com.intellij.cvsSupport2.connections.login; -import java.util.EventListener; +import com.intellij.openapi.vcs.CalledInAwt; +import com.intellij.openapi.vcs.CalledInBackground; +import com.intellij.util.ThreeState; -/** - * Listener for event common for all handlers - */ -public interface GitHandlerListener extends EventListener { +// todo rename? +public interface CvsLoginWorker { /** - * This method is invoked when git process is terminated - * - * @param exitCode a exit code + * @return true if login attempt should be repeated after prompting user */ - void processTerminated(int exitCode); + @CalledInAwt + boolean promptForPassword(); - /** - * This method is invoked if starting git process failed with exception - * - * @param exception an exception - */ - void startFailed(Throwable exception); + @CalledInBackground + ThreeState silentLogin(boolean forceCheck); + void goOffline(); } diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/ConnectionLifeCycle.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/ConnectionLifeCycle.java index 9d12a4a000..56fccce426 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/ConnectionLifeCycle.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/ConnectionLifeCycle.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh; import com.intellij.openapi.util.Ref; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/ConnectionPoolI.java similarity index 61% copy from plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java copy to plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/ConnectionPoolI.java index 91556fe81b..1903951682 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/ConnectionPoolI.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,24 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.intellij.lang.ant.config; +package com.intellij.cvsSupport2.connections.ssh; import org.jetbrains.annotations.Nullable; +import org.netbeans.lib.cvsclient.connection.ConnectionSettings; +import org.netbeans.lib.cvsclient.connection.IConnection; -public interface AntBuildModel { - @Nullable - String getDefaultTargetName(); - - AntBuildTarget[] getTargets(); - - AntBuildTarget[] getFilteredTargets(); - - AntBuildFile getBuildFile(); - - @Nullable - AntBuildTarget findTarget(final String name); - +public interface ConnectionPoolI { @Nullable - String getName(); + IConnection getConnection(final String repository, final ConnectionSettings connectionSettings, final SshAuthentication authentication); } diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/EmptyPool.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/EmptyPool.java index 54a5ad4ce8..ee12ec3eb2 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/EmptyPool.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/EmptyPool.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh; import org.netbeans.lib.cvsclient.connection.IConnection; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/LifeStages.java similarity index 70% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/LifeStages.java index f044a3bc10..266fa78284 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/LifeStages.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.connections.ssh; -import com.intellij.psi.PsiElement; - -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public enum LifeStages { + NOT_EXIST, + CREATED, + CLOSING, + CLOSED } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SSHPasswordProvider.java similarity index 65% copy from plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java copy to plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SSHPasswordProvider.java index 91556fe81b..7e2c377fe6 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SSHPasswordProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -14,23 +14,14 @@ * limitations under the License. */ -package com.intellij.lang.ant.config; +package com.intellij.cvsSupport2.connections.ssh; import org.jetbrains.annotations.Nullable; -public interface AntBuildModel { +public interface SSHPasswordProvider { @Nullable - String getDefaultTargetName(); - - AntBuildTarget[] getTargets(); - - AntBuildTarget[] getFilteredTargets(); - - AntBuildFile getBuildFile(); - - @Nullable - AntBuildTarget findTarget(final String name); + String getPasswordForCvsRoot(String cvsRoot); @Nullable - String getName(); + String getPPKPasswordForCvsRoot(String cvsRoot); } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SmPublicKeyAuthentification.java similarity index 68% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SmPublicKeyAuthentification.java index f044a3bc10..d232ef29b4 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SmPublicKeyAuthentification.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package com.intellij.cvsSupport2.connections.ssh; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface SmPublicKeyAuthentification { + public Throwable PRIVATE_KEY_FILE = new Throwable(); + public Throwable PASSPHRASE = new Throwable(); } diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SocksAuthenticatorManager.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SocksAuthenticatorManager.java index 07ece67349..ba8927aeea 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SocksAuthenticatorManager.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SocksAuthenticatorManager.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh; import com.intellij.openapi.components.ServiceManager; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SocksProxyData.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SocksProxyData.java index f9b3689462..af0bd4bda5 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SocksProxyData.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SocksProxyData.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh; import com.trilead.ssh2.SelfConnectionProxyData; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SolveableAuthenticationException.java similarity index 52% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SolveableAuthenticationException.java index e1da04a96a..0b283c8c60 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SolveableAuthenticationException.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.cvsSupport2.connections.ssh; -package com.intellij.lang.ant.config; +import org.netbeans.lib.cvsclient.connection.AuthenticationException; -import com.intellij.openapi.vfs.VirtualFile; - -public class AntNoFileException extends Exception { - private final VirtualFile myFile; +/** + * author: lesya + */ +public class SolveableAuthenticationException extends AuthenticationException{ + public SolveableAuthenticationException(String message) { + super(message); + } - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; + public SolveableAuthenticationException(String message, Throwable cause) { + super(message, cause); } - public VirtualFile getFile() { - return myFile; + @Override + public boolean isSolveable() { + return true; } } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshAuthentication.java similarity index 56% copy from plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java copy to plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshAuthentication.java index 91556fe81b..30e7add2cd 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshAuthentication.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,24 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.cvsSupport2.connections.ssh; -package com.intellij.lang.ant.config; +import com.intellij.cvsSupport2.connections.ssh.SolveableAuthenticationException; +import com.trilead.ssh2.Connection; +import org.netbeans.lib.cvsclient.connection.AuthenticationException; -import org.jetbrains.annotations.Nullable; - -public interface AntBuildModel { - @Nullable - String getDefaultTargetName(); - - AntBuildTarget[] getTargets(); - - AntBuildTarget[] getFilteredTargets(); - - AntBuildFile getBuildFile(); - - @Nullable - AntBuildTarget findTarget(final String name); - - @Nullable - String getName(); +public interface SshAuthentication { + void authenticate(final Connection connection) throws AuthenticationException, SolveableAuthenticationException; } diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionPool.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionPool.java index 87b78f5007..07966ac877 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionPool.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionPool.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh; import com.intellij.openapi.application.ApplicationManager; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtils.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtils.java index b6dca6a151..4e966b2893 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtils.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtils.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh; import com.trilead.ssh2.Connection; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshLogger.java similarity index 57% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshLogger.java index e1da04a96a..4949ec170c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshLogger.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.cvsSupport2.connections.ssh; -package com.intellij.lang.ant.config; +import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.vfs.VirtualFile; +public class SshLogger { + private final static Logger LOG = Logger.getInstance("#com.intellij.cvsSupport2.connections.ssh.SshLogger"); -public class AntNoFileException extends Exception { - private final VirtualFile myFile; - - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; + public static void debug(final String s) { + LOG.debug(s); } - public VirtualFile getFile() { - return myFile; + public static void debug(final String s, final Throwable t) { + LOG.debug(s, t); } } diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshPasswordAuthentication.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshPasswordAuthentication.java index 60affdec53..596e95735d 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshPasswordAuthentication.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshPasswordAuthentication.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh; import com.trilead.ssh2.Connection; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshProxyFactory.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshProxyFactory.java index 71808764cb..02611b0e74 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshProxyFactory.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshProxyFactory.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh; import com.intellij.cvsSupport2.config.ProxySettings; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshPublicKeyAuthentication.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshPublicKeyAuthentication.java index 8f065b1ce4..52e7253a75 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshPublicKeyAuthentication.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshPublicKeyAuthentication.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh; import com.intellij.openapi.util.io.FileUtil; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshSessionConnection.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshSessionConnection.java index 85e12b386d..3497726699 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshSessionConnection.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshSessionConnection.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh; import com.intellij.openapi.util.ThrowableComputable; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshSharedConnection.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshSharedConnection.java index 33adc1c735..813fbf8015 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshSharedConnection.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshSharedConnection.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh; import com.intellij.openapi.util.ThrowableComputable; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshTypesToUse.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshTypesToUse.java index 01f1a3b219..403c9ed26f 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshTypesToUse.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/connections/ssh/SshTypesToUse.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh; import org.jetbrains.annotations.NonNls; diff --git a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/cvsExecution/ModalityContext.java similarity index 67% copy from plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java copy to plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/cvsExecution/ModalityContext.java index 5ef412416e..ffe22fec54 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/cvsExecution/ModalityContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.cvsIntegration; +package com.intellij.cvsSupport2.cvsExecution; -public interface DateOrRevision { - public String getBranch(); - public boolean shouldUseBranch(); - public String getDate(); - public boolean shouldUseDate(); +import com.intellij.openapi.project.Project; + +public interface ModalityContext { + void runInDispatchThread(Runnable action, Project project); + + boolean isForTemporaryConfiguration(); } diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/RevisionOrDate.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/RevisionOrDate.java index 5481d6a21f..7cca67058f 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/RevisionOrDate.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/RevisionOrDate.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.dateOrRevision; import com.intellij.cvsSupport2.history.CvsRevisionNumber; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/errorHandling/ErrorRegistry.java similarity index 71% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/errorHandling/ErrorRegistry.java index f044a3bc10..af3c1bcddd 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/errorHandling/ErrorRegistry.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package com.intellij.cvsSupport2.errorHandling; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface ErrorRegistry { + void registerError(String description); } diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/history/CvsRevisionNumber.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/history/CvsRevisionNumber.java index 078697c707..5126393644 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/history/CvsRevisionNumber.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/history/CvsRevisionNumber.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.history; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/InputStreamWrapper.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/InputStreamWrapper.java index 2e53845ebd..277091e81e 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/InputStreamWrapper.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/InputStreamWrapper.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.javacvsImpl.io; import org.netbeans.lib.cvsclient.ICvsCommandStopper; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadThread.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadThread.java index 49b3336e9e..8961e3f4d6 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadThread.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadThread.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.javacvsImpl.io; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadWriteStatistics.java b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadWriteStatistics.java index 0697033b64..309a9da432 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadWriteStatistics.java +++ b/plugins/cvs/cvs-core/src/com/intellij/cvsSupport2/javacvsImpl/io/ReadWriteStatistics.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.javacvsImpl.io; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java b/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java index 5ef412416e..798261a74c 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java +++ b/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/Cvs2Configurable.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/Cvs2Configurable.java index eab91f3b72..07686a4ea9 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/Cvs2Configurable.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/Cvs2Configurable.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsActionPlaces.java similarity index 61% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsActionPlaces.java index f044a3bc10..cc9a771437 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsActionPlaces.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2; -import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.NonNls; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface CvsActionPlaces { + @NonNls String CVS_CONFIGURATIONS_TOOLBAR = "CvsConfigurationsToolbar"; + @NonNls String ADD_FILES_TOOLBAR = "AddFilesToolbar"; + @NonNls String REMOVE_FILES_TOOLBAR = "RemoveFilesToolbar"; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsCheckinHandlerFactory.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsCheckinHandlerFactory.java index 5d5c0a0a6c..2cb1a8d067 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsCheckinHandlerFactory.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsCheckinHandlerFactory.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * 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.cvsSupport2; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsDiffProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsDiffProvider.java index eb51e33218..72034d5ecf 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsDiffProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsDiffProvider.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsResultEx.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsResultEx.java index 3b4e26e3f4..b6f21c82e7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsResultEx.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsResultEx.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2; import com.intellij.cvsSupport2.cvshandlers.CvsHandler; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsRevisionSelector.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsRevisionSelector.java index 5f68b27e44..debc68072b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsRevisionSelector.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsRevisionSelector.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2; import com.intellij.cvsSupport2.history.CvsRevisionNumber; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsStandardOperationsProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsStandardOperationsProvider.java index 06d74cda1f..5312719a9e 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsStandardOperationsProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsStandardOperationsProvider.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.cvsSupport2; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsStatusEnvironment.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsStatusEnvironment.java index 8e4475f29e..bec976b09d 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsStatusEnvironment.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsStatusEnvironment.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2; import com.intellij.cvsSupport2.actions.update.UpdateSettings; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsUpdateEnvironment.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsUpdateEnvironment.java index f6a99a54ea..54cbff0b2e 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsUpdateEnvironment.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsUpdateEnvironment.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.cvsSupport2; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsUtil.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsUtil.java index 15cc8381e9..51a24090cf 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsUtil.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsUtil.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java index 3e5e4106f6..267aab0c42 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/CvsVcs2.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/UpdateConfigurable.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/UpdateConfigurable.java index 6c9edf3ba2..f357e69ae8 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/UpdateConfigurable.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/UpdateConfigurable.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.cvsSupport2; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractAction.java index c3b4f9e588..c2d77e36ba 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.CvsBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractActionFromEditGroup.java similarity index 52% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractActionFromEditGroup.java index e1da04a96a..e4510f52f8 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractActionFromEditGroup.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.cvsSupport2.actions; -package com.intellij.lang.ant.config; +import com.intellij.cvsSupport2.actions.actionVisibility.CvsActionVisibility; -import com.intellij.openapi.vfs.VirtualFile; +public abstract class AbstractActionFromEditGroup extends ActionOnSelectedElement { + public AbstractActionFromEditGroup() { + super(false); -public class AntNoFileException extends Exception { - private final VirtualFile myFile; + CvsActionVisibility visibility = getVisibility(); + visibility.canBePerformedOnSeveralFiles(); + visibility.addCondition(FILES_EXIST_IN_CVS); + visibility.addCondition(FILES_ARE_NOT_DELETED); - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; } - - public VirtualFile getFile() { - return myFile; - } -} +} \ No newline at end of file diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractWatchAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractWatchAction.java index 1ffd8cc6fa..6784ac2f32 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractWatchAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractWatchAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.actions.cvsContext.CvsContext; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractWatchOnOffAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractWatchOnOffAction.java index 181e4b434b..0a35e511f7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractWatchOnOffAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AbstractWatchOnOffAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.actions.cvsContext.CvsContext; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ActionOnSelectedElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ActionOnSelectedElement.java index 74f57d156e..616a9baa01 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ActionOnSelectedElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ActionOnSelectedElement.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AddFileOrDirectoryAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AddFileOrDirectoryAction.java index 61e4411ec7..827878244f 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AddFileOrDirectoryAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/AddFileOrDirectoryAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/BranchAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/BranchAction.java index 75aa4beaa4..707376ab8a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/BranchAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/BranchAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.actions.actionVisibility.CvsActionVisibility; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/BrowseCvsRepositoryAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/BrowseCvsRepositoryAction.java index 30d0e6f444..2cec9827f7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/BrowseCvsRepositoryAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/BrowseCvsRepositoryAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/CheckoutFileAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/CheckoutFileAction.java index 914d0da4d8..88f3f96686 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/CheckoutFileAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/CheckoutFileAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.CvsVcs2; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ConfigureCvsRootsAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ConfigureCvsRootsAction.java index 45aece23ba..f82d28bbc6 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ConfigureCvsRootsAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ConfigureCvsRootsAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.actions.cvsContext.CvsContextWrapper; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/CreateTagAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/CreateTagAction.java index 3bca68763d..f151e238a0 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/CreateTagAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/CreateTagAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.actions.actionVisibility.CvsActionVisibility; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/Cvs2Group.java similarity index 53% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/Cvs2Group.java index e1da04a96a..29e12d56c2 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/Cvs2Group.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.cvsSupport2.actions; -package com.intellij.lang.ant.config; +import com.intellij.cvsSupport2.CvsVcs2; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.vcs.AbstractVcs; +import com.intellij.openapi.vcs.actions.StandardVcsGroup; -import com.intellij.openapi.vfs.VirtualFile; - -public class AntNoFileException extends Exception { - private final VirtualFile myFile; - - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; +public class Cvs2Group extends StandardVcsGroup { + public AbstractVcs getVcs(Project project) { + return CvsVcs2.getInstance(project); } - public VirtualFile getFile() { - return myFile; + @Override + public String getVcsName(final Project project) { + return "CVS"; } } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/CvsGlobalAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/CvsGlobalAction.java index ae0f0a735c..5c3d2c08c8 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/CvsGlobalAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/CvsGlobalAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.actions.cvsContext.CvsContext; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/DeleteTagAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/DeleteTagAction.java index 3d1004a974..b8ca2c53b3 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/DeleteTagAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/DeleteTagAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.actions.actionVisibility.CvsActionVisibility; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/EditAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/EditAction.java index 9b2ba3d564..14864706e9 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/EditAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/EditAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.CvsVcs2; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/GetFileFromRepositoryAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/GetFileFromRepositoryAction.java index 7c84fcc895..c9c40298bd 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/GetFileFromRepositoryAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/GetFileFromRepositoryAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.actions.actionVisibility.CvsActionVisibility; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/GlobalSettingsAction.java similarity index 59% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/GlobalSettingsAction.java index f044a3bc10..daff46d03a 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/GlobalSettingsAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.actions; -import com.intellij.psi.PsiElement; +import com.intellij.cvsSupport2.config.ui.ConfigureCvsGlobalSettingsDialog; +import com.intellij.openapi.actionSystem.AnActionEvent; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class GlobalSettingsAction extends CvsGlobalAction{ + public void actionPerformed(AnActionEvent e) { + new ConfigureCvsGlobalSettingsDialog().show(); + } } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/IgnoreFileAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/IgnoreFileAction.java index 2342ef6470..e4095d7639 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/IgnoreFileAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/IgnoreFileAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ImportAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ImportAction.java index 59122ce9ca..43023fb046 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ImportAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ImportAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.actions.cvsContext.CvsContext; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RemoveLocallyDeletedFilesAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RemoveLocallyDeletedFilesAction.java index 2fc051387c..04572ce234 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RemoveLocallyDeletedFilesAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RemoveLocallyDeletedFilesAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RemoveLocallyFileOrDirectoryAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RemoveLocallyFileOrDirectoryAction.java index fb106856a3..0bd159c261 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RemoveLocallyFileOrDirectoryAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RemoveLocallyFileOrDirectoryAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RestoreFileAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RestoreFileAction.java index a2de3fbc73..6dfa8429f9 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RestoreFileAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/RestoreFileAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.actions.cvsContext.CvsContext; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ToggleOfflineAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ToggleOfflineAction.java index 3f7a140dd8..72b0982e77 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ToggleOfflineAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ToggleOfflineAction.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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. */ /* diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/UneditAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/UneditAction.java index 7f8bed3e9b..cddaa1e94a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/UneditAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/UneditAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/UnmarkAddedAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/UnmarkAddedAction.java index b1bd24252b..ec9106b9b2 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/UnmarkAddedAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/UnmarkAddedAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ViewEditorsAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ViewEditorsAction.java index 28e7fdcbaa..2152e190f3 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ViewEditorsAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ViewEditorsAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.actions.cvsContext.CvsContext; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ViewWatchersAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ViewWatchersAction.java index 42f62da0bd..6cbea182da 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ViewWatchersAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/ViewWatchersAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.cvsSupport2.actions.cvsContext.CvsContext; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchAddAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchAddAction.java index c4cc3df843..321e381f0b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchAddAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchAddAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.openapi.vcs.actions.VcsContext; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchOffAction.java similarity index 55% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchOffAction.java index e1da04a96a..6f806a2980 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchOffAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.cvsSupport2.actions; -package com.intellij.lang.ant.config; +import com.intellij.openapi.vcs.actions.VcsContext; +import org.netbeans.lib.cvsclient.command.watch.WatchMode; -import com.intellij.openapi.vfs.VirtualFile; - -public class AntNoFileException extends Exception { - private final VirtualFile myFile; - - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; +/** + * author: lesya + */ +public class WatchOffAction extends AbstractWatchOnOffAction { + protected String getTitle(VcsContext context) { + return com.intellij.CvsBundle.message("operation.name.watching.off"); } - public VirtualFile getFile() { - return myFile; + protected WatchMode getMode() { + return WatchMode.OFF; } + } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchOnAction.java similarity index 55% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchOnAction.java index e1da04a96a..1211b9e5b7 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchOnAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.cvsSupport2.actions; -package com.intellij.lang.ant.config; +import com.intellij.openapi.vcs.actions.VcsContext; +import org.netbeans.lib.cvsclient.command.watch.WatchMode; -import com.intellij.openapi.vfs.VirtualFile; - -public class AntNoFileException extends Exception { - private final VirtualFile myFile; - - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; +/** + * author: lesya + */ +public class WatchOnAction extends AbstractWatchOnOffAction { + protected String getTitle(VcsContext context) { + return com.intellij.CvsBundle.message("operation.name.watching.on"); } - public VirtualFile getFile() { - return myFile; + protected WatchMode getMode() { + return WatchMode.ON; } } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchRemoveAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchRemoveAction.java index 9ade4ba61b..7f0bd19e99 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchRemoveAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/WatchRemoveAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions; import com.intellij.openapi.vcs.actions.VcsContext; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/actionVisibility/CvsActionVisibility.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/actionVisibility/CvsActionVisibility.java index 0b96696419..ec73e45210 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/actionVisibility/CvsActionVisibility.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/actionVisibility/CvsActionVisibility.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions.actionVisibility; import com.intellij.cvsSupport2.actions.cvsContext.CvsContext; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CachedCvsContext.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CachedCvsContext.java index 9b447dca0c..b93643fcd4 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CachedCvsContext.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CachedCvsContext.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions.cvsContext; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsContext.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsContext.java index 70717fb73d..52d6a10d3b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsContext.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsContext.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions.cvsContext; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsContextAdapter.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsContextAdapter.java index ba4c9f4093..c45a296c53 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsContextAdapter.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsContextAdapter.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions.cvsContext; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsContextWrapper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsContextWrapper.java index 53c9c0606c..9afa82ebee 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsContextWrapper.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsContextWrapper.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions.cvsContext; import com.intellij.cvsSupport2.CvsVcs2; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsDataConstants.java similarity index 56% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsDataConstants.java index f044a3bc10..94368a53f6 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsDataConstants.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package com.intellij.cvsSupport2.actions.cvsContext; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +@SuppressWarnings({"ALL"}) +public interface CvsDataConstants { + String DELETED_FILE_NAMES = "DeletedFileNames"; + String FILE_TO_RESTORE = "FileToRestore"; + String CVS_LIGHT_FILE = "CVS_LIGHT_FILE"; + String CVS_LIGHT_FILES = "CVS_LIGHT_FILES"; + String CVS_ENVIRONMENT = "CVS_ENVIRONMENT"; + String FILES_TO_ADD = "FilesToAdd"; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsLightweightFile.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsLightweightFile.java index 169927e467..74ecaa61b7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsLightweightFile.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/cvsContext/CvsLightweightFile.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions.cvsContext; import java.io.File; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/CvsConflictsParser.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/CvsConflictsParser.java index 8b7b11a85a..52b297fc40 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/CvsConflictsParser.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/CvsConflictsParser.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions.merge; import org.jetbrains.annotations.Nullable; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/CvsMergeProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/CvsMergeProvider.java index 5bfccc5d52..b0b8de5d36 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/CvsMergeProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/CvsMergeProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java index 9089f186ca..e76f2f0614 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions.merge; import com.intellij.cvsSupport2.actions.actionVisibility.CvsActionVisibility; diff --git a/plugins/devkit/src/util/ActionData.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeDataProvider.java similarity index 57% copy from plugins/devkit/src/util/ActionData.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeDataProvider.java index 04c436af9c..4c45c93f1a 100644 --- a/plugins/devkit/src/util/ActionData.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeDataProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. @@ -13,34 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.idea.devkit.util; +package com.intellij.cvsSupport2.actions.merge; -import org.jetbrains.annotations.Nullable; +import com.intellij.openapi.vcs.VcsException; +import com.intellij.openapi.vcs.merge.MergeData; import org.jetbrains.annotations.NotNull; /** - * @author swr + * Created by IntelliJ IDEA. + * User: lesya + * Date: Jul 14, 2005 + * Time: 5:53:07 PM + * To change this template use File | Settings | File Templates. */ -public interface ActionData { - @NotNull - String getActionId(); +interface MergeDataProvider { @NotNull - String getActionText(); - - String getActionDescription(); - - @Nullable - String getSelectedGroupId(); - - @Nullable - String getSelectedActionId(); - - String getSelectedAnchor(); - - @Nullable - String getFirstKeyStroke(); - - @Nullable - String getSecondKeyStroke(); + MergeData createData() throws VcsException; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeInfo.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeInfo.java index 671c7cd455..93118cf53e 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeInfo.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/merge/MergeInfo.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions.merge; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateByBranchUpdateSettings.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateByBranchUpdateSettings.java index c3c5f636b0..8e101840e9 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateByBranchUpdateSettings.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateByBranchUpdateSettings.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions.update; import com.intellij.cvsSupport2.cvsoperations.dateOrRevision.RevisionOrDate; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateSettings.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateSettings.java index b81162da38..4447a1ea72 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateSettings.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateSettings.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions.update; import com.intellij.cvsSupport2.cvsoperations.dateOrRevision.RevisionOrDate; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateSettingsOnCvsConfiguration.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateSettingsOnCvsConfiguration.java index 1507ff6671..f6e922283d 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateSettingsOnCvsConfiguration.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/actions/update/UpdateSettingsOnCvsConfiguration.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.actions.update; import com.intellij.cvsSupport2.config.CvsConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsAnnotationProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsAnnotationProvider.java index 078dd5f0e7..1c66185f35 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsAnnotationProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsAnnotationProvider.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.cvsSupport2.annotate; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsFileAnnotation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsFileAnnotation.java index c8429b27b5..19631180a6 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsFileAnnotation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsFileAnnotation.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.cvsSupport2.annotate; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/AddHandler.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/AddHandler.java index 0bee7119e2..c70a99aa74 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/AddHandler.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/AddHandler.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.application; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsEntriesManager.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsEntriesManager.java index 015d2b393c..3ef022176d 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsEntriesManager.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsEntriesManager.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.application; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsFileOperationsHandler.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsFileOperationsHandler.java index 08c3aa62a4..e8a095a862 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsFileOperationsHandler.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsFileOperationsHandler.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.application; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsInfo.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsInfo.java index b3869e1242..a1ea43c4d2 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsInfo.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsInfo.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.application; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsStorageComponent.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsStorageComponent.java index 40de569344..d3af0730f2 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsStorageComponent.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsStorageComponent.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.application; import com.intellij.openapi.project.Project; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsStorageSupportingDeletionComponent.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsStorageSupportingDeletionComponent.java index 3b1c3c8011..c4ab154db3 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsStorageSupportingDeletionComponent.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/CvsStorageSupportingDeletionComponent.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.application; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/DeleteHandler.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/DeleteHandler.java index 9c62cb7f2e..cbd3d18510 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/DeleteHandler.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/DeleteHandler.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.application; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/DeletedCVSDirectoryStorage.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/DeletedCVSDirectoryStorage.java index 586327e12b..228ae24d6b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/DeletedCVSDirectoryStorage.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/application/DeletedCVSDirectoryStorage.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.application; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsBinaryContentRevision.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsBinaryContentRevision.java index 69255875de..d06d438c61 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsBinaryContentRevision.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsBinaryContentRevision.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * 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.cvsSupport2.changeBrowser; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsChangeList.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsChangeList.java index a84096d539..e1835cfac8 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsChangeList.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsChangeList.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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. */ /* diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsChangeListsBuilder.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsChangeListsBuilder.java index c7a937aeba..9e4a0b5dfc 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsChangeListsBuilder.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsChangeListsBuilder.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.changeBrowser; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsCommittedChangesProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsCommittedChangesProvider.java index 0671adaab5..866a6a2ea8 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsCommittedChangesProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsCommittedChangesProvider.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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.cvsSupport2.changeBrowser; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsContentRevision.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsContentRevision.java index f69cf3c3f1..2b1c6a962d 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsContentRevision.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsContentRevision.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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. */ /* diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsRepositoryLocation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsRepositoryLocation.java index f66d884a58..28fe3cdc04 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsRepositoryLocation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsRepositoryLocation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.changeBrowser; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsVersionFilterComponent.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsVersionFilterComponent.java index 61e0d437a7..486623bf7f 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsVersionFilterComponent.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/CvsVersionFilterComponent.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.changeBrowser; import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/LoadHistoryOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/LoadHistoryOperation.java index adfbf35f39..ee53ab837b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/LoadHistoryOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/LoadHistoryOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.changeBrowser; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/LogInformationWrapper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/LogInformationWrapper.java index 72611e32e0..5eba958666 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/LogInformationWrapper.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/LogInformationWrapper.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.changeBrowser; import com.intellij.openapi.util.io.FileUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/RevisionWrapper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/RevisionWrapper.java index f5d5b94e63..626b4376af 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/RevisionWrapper.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/changeBrowser/RevisionWrapper.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.changeBrowser; import org.jetbrains.annotations.NotNull; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/AdditionalOptionsPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/AdditionalOptionsPanel.java index 9bcce26430..6e26ae0440 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/AdditionalOptionsPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/AdditionalOptionsPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.checkinProject; import com.intellij.cvsSupport2.config.CvsConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsCheckinEnvironment.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsCheckinEnvironment.java index b73651164f..bb7f71409a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsCheckinEnvironment.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsCheckinEnvironment.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.checkinProject; import com.intellij.CvsBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsDiffColors.java similarity index 54% copy from plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsDiffColors.java index 91556fe81b..bde7e06dd7 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsDiffColors.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,24 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.cvsSupport2.checkinProject; -package com.intellij.lang.ant.config; +import com.intellij.openapi.editor.colors.TextAttributesKey; -import org.jetbrains.annotations.Nullable; - -public interface AntBuildModel { - @Nullable - String getDefaultTargetName(); - - AntBuildTarget[] getTargets(); - - AntBuildTarget[] getFilteredTargets(); - - AntBuildFile getBuildFile(); - - @Nullable - AntBuildTarget findTarget(final String name); - - @Nullable - String getName(); +public interface CvsDiffColors { + TextAttributesKey DIFF_UNKNOWN = TextAttributesKey.createTextAttributesKey("DIFF_UNKNOWN"); + TextAttributesKey DIFF_IGNORED = TextAttributesKey.createTextAttributesKey("DIFF_IGNORED"); + TextAttributesKey DIFF_DELETED_FROM_FS = TextAttributesKey.createTextAttributesKey("DIIF_DELETED_FROM_FS"); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsRollbackEnvironment.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsRollbackEnvironment.java index d5b24477b0..a7e20ecd57 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsRollbackEnvironment.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsRollbackEnvironment.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.checkinProject; import com.intellij.cvsSupport2.config.CvsConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsRollbacker.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsRollbacker.java index d51acebfdd..649d25c069 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsRollbacker.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/CvsRollbacker.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.checkinProject; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/DirectoryContent.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/DirectoryContent.java index d771595235..7899bf55d2 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/DirectoryContent.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/DirectoryContent.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.checkinProject; import com.intellij.openapi.vfs.VirtualFile; diff --git a/plugins/git4idea/src/git4idea/commands/GitLineHandlerAdapter.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/VirtualFileEntry.java similarity index 52% copy from plugins/git4idea/src/git4idea/commands/GitLineHandlerAdapter.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/VirtualFileEntry.java index fc9ae33260..3e4b128816 100644 --- a/plugins/git4idea/src/git4idea/commands/GitLineHandlerAdapter.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkinProject/VirtualFileEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. @@ -13,32 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package git4idea.commands; +package com.intellij.cvsSupport2.checkinProject; -import com.intellij.openapi.util.Key; +import com.intellij.openapi.vfs.*; +import org.netbeans.lib.cvsclient.admin.*; /** - * An adapter for line handler + * author: lesya */ -public class GitLineHandlerAdapter implements GitLineHandlerListener { - /** - * {@inheritDoc} - */ - public void onLineAvailable(final String line, final Key outputType) { - // do nothing +public class VirtualFileEntry { + private final VirtualFile myVirtualFile; + private final Entry myEntry; + + public VirtualFileEntry(VirtualFile virtualFile, Entry entry) { + myVirtualFile = virtualFile; + myEntry = entry; } - /** - * {@inheritDoc} - */ - public void processTerminated(final int exitCode) { - // do nothing + public VirtualFile getVirtualFile() { + return myVirtualFile; } - /** - * {@inheritDoc} - */ - public void startFailed(final Throwable exception) { - // do nothing + public Entry getEntry() { + return myEntry; } } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkout/CheckoutAction.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkout/CheckoutAction.java index 60d833dc0c..adee09cf41 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkout/CheckoutAction.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkout/CheckoutAction.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.checkout; import com.intellij.cvsSupport2.CvsVcs2; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkout/CvsCheckoutProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkout/CvsCheckoutProvider.java index f3710a466d..10c458a1a9 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkout/CvsCheckoutProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/checkout/CvsCheckoutProvider.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.checkout; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/AbstractConfiguration.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/AbstractConfiguration.java index 316a0ec0a5..99b5a1bcc6 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/AbstractConfiguration.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/AbstractConfiguration.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config; import com.intellij.openapi.components.ProjectComponent; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java index b24a4d3282..cdb9497950 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsApplicationLevelConfiguration.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config; import com.intellij.openapi.components.ApplicationComponent; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsConfiguration.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsConfiguration.java index 5850bb4e7b..583fd97208 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsConfiguration.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsConfiguration.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsRootConfiguration.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsRootConfiguration.java index b02f40a59b..a86c2a2244 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsRootConfiguration.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsRootConfiguration.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config; import com.intellij.CvsBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsRootEditor.java similarity index 70% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsRootEditor.java index f044a3bc10..9324949968 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/CvsRootEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.config; -import com.intellij.psi.PsiElement; - -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface CvsRootEditor { + String getCurrentRoot(); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ImportConfiguration.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ImportConfiguration.java index f446ce101f..5c5ec938e8 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ImportConfiguration.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ImportConfiguration.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config; import com.intellij.cvsSupport2.ui.experts.importToCvs.FileExtension; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/ConfigureCvsGlobalSettingsDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/ConfigureCvsGlobalSettingsDialog.java index 225d211a48..1d5790f131 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/ConfigureCvsGlobalSettingsDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/ConfigureCvsGlobalSettingsDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config.ui; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/Cvs2SettingsEditPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/Cvs2SettingsEditPanel.java index c2d47e4005..5ae786e097 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/Cvs2SettingsEditPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/Cvs2SettingsEditPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config.ui; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.java index 3d44b64f05..71178a63a3 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config.ui; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationsListEditor.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationsListEditor.java index 3d2b4423cd..f27c5ac30f 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationsListEditor.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsConfigurationsListEditor.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config.ui; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsListCellRenderer.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsListCellRenderer.java dissimilarity index 72% index 07341b243b..72588714c3 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsListCellRenderer.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsListCellRenderer.java @@ -1,58 +1,42 @@ -/* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - * - */ -package com.intellij.cvsSupport2.config.ui; - -import com.intellij.cvsSupport2.ui.AbstractListCellRenderer; -import com.intellij.openapi.util.IconLoader; - -import javax.swing.*; - -/** - * author: lesya - */ - -public class CvsListCellRenderer extends AbstractListCellRenderer { - private static final Icon ICON = IconLoader.getIcon("/actions/cvs.png"); - - protected Icon getPresentableIcon(Object value) { - if (value == null) return null; - return ICON; - } - - protected String getPresentableString(Object value) { - if (value == null) - return ""; - else - return value.toString(); - } - -} +/* + * 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.cvsSupport2.config.ui; + +import com.intellij.cvsSupport2.ui.AbstractListCellRenderer; +import com.intellij.openapi.util.IconLoader; + +import javax.swing.*; + +/** + * author: lesya + */ + +public class CvsListCellRenderer extends AbstractListCellRenderer { + private static final Icon ICON = IconLoader.getIcon("/actions/cvs.png"); + + protected Icon getPresentableIcon(Object value) { + if (value == null) return null; + return ICON; + } + + protected String getPresentableString(Object value) { + if (value == null) + return ""; + else + return value.toString(); + } + +} diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsRootAsStringConfigurationPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsRootAsStringConfigurationPanel.java index 7b68516c15..5bb0ec6850 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsRootAsStringConfigurationPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsRootAsStringConfigurationPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config.ui; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsRootFieldByFieldConfigurationPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsRootFieldByFieldConfigurationPanel.java index 2cff15a015..9412b7597c 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsRootFieldByFieldConfigurationPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsRootFieldByFieldConfigurationPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config.ui; import com.intellij.cvsSupport2.config.CvsRootConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/GlobalCvsSettingsPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/GlobalCvsSettingsPanel.java index aa8b4a7a26..2c8105aa6b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/GlobalCvsSettingsPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/GlobalCvsSettingsPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config.ui; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/SelectCvsConfgurationPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/SelectCvsConfgurationPanel.java index a69464a2fa..0739c58589 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/SelectCvsConfgurationPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/SelectCvsConfgurationPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config.ui; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/SelectCvsConfigurationDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/SelectCvsConfigurationDialog.java index e740fa520c..d99cd35008 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/SelectCvsConfigurationDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/SelectCvsConfigurationDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.config.ui; import com.intellij.cvsSupport2.config.CvsRootConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ConnectionWrapper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ConnectionWrapper.java index 83adfbe758..e281a4fef4 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ConnectionWrapper.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ConnectionWrapper.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections; import com.intellij.cvsSupport2.javacvsImpl.io.InputStreamWrapper; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsConnectionSettings.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsConnectionSettings.java index 3a0bc2e420..bdc8a0865b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsConnectionSettings.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsConnectionSettings.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections; import com.intellij.cvsSupport2.config.*; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootDataBuilder.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootDataBuilder.java index efd0dfedc8..ad7d9cc5ed 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootDataBuilder.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootDataBuilder.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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.cvsSupport2.connections; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootOnEnvironment.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootOnEnvironment.java index 9528115eea..3fbef5feeb 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootOnEnvironment.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootOnEnvironment.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections; import com.intellij.cvsSupport2.cvsoperations.dateOrRevision.RevisionOrDate; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootOnFileSystem.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootOnFileSystem.java index 46580ae5bf..14ea23cd30 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootOnFileSystem.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootOnFileSystem.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootProvider.java index 337ec79fd5..c3804300ea 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/CvsRootProvider.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections; import com.intellij.cvsSupport2.connections.login.CvsLoginWorker; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/IDEARootFormatter.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/IDEARootFormatter.java index ba18d51a4e..72491a928e 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/IDEARootFormatter.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/IDEARootFormatter.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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.cvsSupport2.connections; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/SelfTestingConnection.java similarity index 62% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/SelfTestingConnection.java index f044a3bc10..2b9d7496a0 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/SelfTestingConnection.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.connections; -import com.intellij.psi.PsiElement; +import org.netbeans.lib.cvsclient.connection.AuthenticationException; +import org.netbeans.lib.cvsclient.ICvsCommandStopper; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface SelfTestingConnection { + void test(ICvsCommandStopper stopper) throws AuthenticationException; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/SelfTestingConnectionWrapper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/SelfTestingConnectionWrapper.java index 7519f6cc39..fca5bb6cb4 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/SelfTestingConnectionWrapper.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/SelfTestingConnectionWrapper.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections; import com.intellij.cvsSupport2.connections.SelfTestingConnection; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ExtConnectionCvsSettings.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ExtConnectionCvsSettings.java index be7ba748b1..e11e37232a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ExtConnectionCvsSettings.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ExtConnectionCvsSettings.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ext; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ExtLoginWorker.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ExtLoginWorker.java index cc376ddcc1..3437138db6 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ExtLoginWorker.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ExtLoginWorker.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ext; import com.intellij.cvsSupport2.connections.login.CvsLoginWorkerImpl; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ui/ExtConnectionDualPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ui/ExtConnectionDualPanel.java index 792680a3a1..85d1e958e6 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ui/ExtConnectionDualPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ui/ExtConnectionDualPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ext.ui; import com.intellij.cvsSupport2.config.CvsRootEditor; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ui/ExtConnectionSettingsPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ui/ExtConnectionSettingsPanel.java index 81d401d72a..a32b9c6192 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ui/ExtConnectionSettingsPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ext/ui/ExtConnectionSettingsPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ext.ui; import com.intellij.cvsSupport2.config.ExtConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/local/LocalConnectionSettings.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/local/LocalConnectionSettings.java index 8b500cfab9..9df6b8c53e 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/local/LocalConnectionSettings.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/local/LocalConnectionSettings.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.local; import com.intellij.cvsSupport2.config.CvsRootConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/local/ui/LocalConnectionSettingsPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/local/ui/LocalConnectionSettingsPanel.java index 87ae35949f..739c534be9 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/local/ui/LocalConnectionSettingsPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/local/ui/LocalConnectionSettingsPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.local.ui; import com.intellij.cvsSupport2.config.LocalSettings; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/login/CvsLoginWorkerImpl.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/login/CvsLoginWorkerImpl.java index a1f61baff2..31fa69db38 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/login/CvsLoginWorkerImpl.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/login/CvsLoginWorkerImpl.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.login; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerCvsSettings.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerCvsSettings.java index 8e9cc10aef..6656c0d4c7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerCvsSettings.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerCvsSettings.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.pserver; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerLoginProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerLoginProvider.java index a07e361e3c..af6df47c67 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerLoginProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerLoginProvider.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.pserver; import com.intellij.cvsSupport2.connections.login.CvsLoginWorker; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerLoginProviderImpl.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerLoginProviderImpl.java index e4dcea8104..52508253a7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerLoginProviderImpl.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/PServerLoginProviderImpl.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.pserver; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/ui/PServerSettingsPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/ui/PServerSettingsPanel.java index 0947b3a379..6c76e0f783 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/ui/PServerSettingsPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/pserver/ui/PServerSettingsPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.pserver.ui; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SSHPasswordProviderImpl.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SSHPasswordProviderImpl.java index d9e23e45d3..a73df4ec39 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SSHPasswordProviderImpl.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SSHPasswordProviderImpl.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh; import com.intellij.openapi.components.ApplicationComponent; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionSettings.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionSettings.java index 60497d75aa..f8a1f17a48 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionSettings.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionSettings.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.cvsSupport2.connections.ssh; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtil.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtil.java index 0249f06316..15e978fa70 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtil.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/SshConnectionUtil.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshConnectionSettingsPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshConnectionSettingsPanel.java index 4731854247..823b837b9c 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshConnectionSettingsPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshConnectionSettingsPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh.ui; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshPasswordDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshPasswordDialog.java index 01d4160948..9a494903af 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshPasswordDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ssh/ui/SshPasswordDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ssh.ui; import com.intellij.openapi.ui.DialogWrapper; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ui/ProxySettingsPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ui/ProxySettingsPanel.java index 08c74511af..16a2b65ba3 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ui/ProxySettingsPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/connections/ui/ProxySettingsPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.connections.ui; import com.intellij.cvsSupport2.config.ProxySettings; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/AbstractVcsDataProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/AbstractVcsDataProvider.java index 237ec752af..28f26dcacf 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/AbstractVcsDataProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/AbstractVcsDataProvider.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsBrowser; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CheckoutHelper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CheckoutHelper.java index 6a01968f0f..7e664ef537 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CheckoutHelper.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CheckoutHelper.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsBrowser; import com.intellij.cvsSupport2.config.CvsRootConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/Cvs2Renderer.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/Cvs2Renderer.java index 07c26b3293..75e99d2474 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/Cvs2Renderer.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/Cvs2Renderer.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsBrowser; import com.intellij.ui.ColoredTreeCellRenderer; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsElement.java index c6bc54dbac..40fa128271 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsElement.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsBrowser; import com.intellij.cvsSupport2.cvsoperations.cvsMessages.CvsListenerWithProgress; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsElementFactory.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsElementFactory.java index bd9a803dda..9fabdfe9aa 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsElementFactory.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsElementFactory.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsBrowser; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsFile.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsFile.java index 4a99eca0e5..8c9c59aaa8 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsFile.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsFile.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsBrowser; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsModule.java similarity index 59% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsModule.java index f044a3bc10..e217aee551 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsModule.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.cvsBrowser; -import com.intellij.psi.PsiElement; +import com.intellij.openapi.project.Project; + +import javax.swing.*; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class CvsModule extends CvsElement{ + + public CvsModule(Icon icon, Icon expandedIcon, Project project) { + super(icon, expandedIcon, project); + } + + public String createPathForChild(String name) { + return name; + } } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsTree.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsTree.java index e791cf498d..5d5b19c07d 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsTree.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsTree.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsBrowser; import com.intellij.cvsSupport2.config.CvsRootConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsTreeModel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsTreeModel.java index 36ee6b5a7c..7ee71be7b7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsTreeModel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsTreeModel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsBrowser; import javax.swing.*; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/FolderDataProvider.java similarity index 56% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/FolderDataProvider.java index e1da04a96a..fe956d7f6d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/FolderDataProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.cvsSupport2.cvsBrowser; -package com.intellij.lang.ant.config; +import com.intellij.cvsSupport2.connections.CvsEnvironment; -import com.intellij.openapi.vfs.VirtualFile; - -public class AntNoFileException extends Exception { - private final VirtualFile myFile; - - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; +public class FolderDataProvider extends AbstractVcsDataProvider { + public FolderDataProvider(CvsEnvironment environment, boolean showFiles, boolean showModules) { + super(environment, showFiles, showModules); } - public VirtualFile getFile() { - return myFile; + protected AbstractVcsDataProvider getChildrenDataProvider() { + return this; } + } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/GetContentCallback.java similarity index 54% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/GetContentCallback.java index f044a3bc10..8a697a6124 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/GetContentCallback.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.cvsBrowser; -import com.intellij.psi.PsiElement; +import com.intellij.cvsSupport2.cvsoperations.cvsMessages.CvsListenerWithProgress; + +import java.util.List; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface GetContentCallback { + void appendDirectoryContent(List directoryContent); + + void fillDirectoryContent(List directoryContent); + + void loginAborted(); + + void finished(); + + void useForCancel(final CvsListenerWithProgress listener); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/LoadingNode.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/LoadingNode.java index 3208b901a1..a3fed13a5e 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/LoadingNode.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/LoadingNode.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/LoginAbortedException.java similarity index 66% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/LoginAbortedException.java index f044a3bc10..a787d9c8f7 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/LoginAbortedException.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package com.intellij.cvsSupport2.cvsBrowser; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class LoginAbortedException extends RuntimeException{ + public LoginAbortedException() { + super(com.intellij.CvsBundle.message("exception.text.cannot.login.to.cvs")); + } } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/ModuleDataProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/ModuleDataProvider.java index 5c5eb4f4ed..c32c269440 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/ModuleDataProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/ModuleDataProvider.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsBrowser; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildListener.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/RemoteResourceDataProvider.java similarity index 56% copy from plugins/ant/src/com/intellij/lang/ant/config/AntBuildListener.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/RemoteResourceDataProvider.java index 7fa229e2d1..e2e5bf0552 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildListener.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/RemoteResourceDataProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,18 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.cvsSupport2.cvsBrowser; -package com.intellij.lang.ant.config; +import com.intellij.openapi.project.Project; -public interface AntBuildListener { +public interface RemoteResourceDataProvider { + RemoteResourceDataProvider NOT_EXPANDABLE = new RemoteResourceDataProvider(){ + public void fillContentFor(CvsElement element, Project project, GetContentCallback callback) { - int FINISHED_SUCCESSFULLY = 0; - int ABORTED = 1; - int FAILED_TO_RUN = 2; + } - AntBuildListener NULL = new AntBuildListener() { - public void buildFinished(int state, int errorCount) { } }; - void buildFinished(int state, int errorCount); + void fillContentFor(CvsElement element, Project project, GetContentCallback callback); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/RootDataProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/RootDataProvider.java index ecb9a1150d..a9c326ab2d 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/RootDataProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/RootDataProvider.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsBrowser; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/ui/BrowserPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/ui/BrowserPanel.java index d3d7a6d3b0..2c962a921a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/ui/BrowserPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/ui/BrowserPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsBrowser.ui; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutor.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutor.java index 97afb848eb..34bd746a46 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutor.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutor.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsExecution; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutorCallback.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutorCallback.java index 00cc5fbcfb..b41a278284 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutorCallback.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/CvsOperationExecutorCallback.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsExecution; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/ModalityContextImpl.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/ModalityContextImpl.java index 5acb129977..0bfe1bf34b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/ModalityContextImpl.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsExecution/ModalityContextImpl.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsExecution; import com.intellij.lifecycle.PeriodicalTasksCloser; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoreFileFilter.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoreFileFilter.java index 69719f4a37..12698a5c9f 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoreFileFilter.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoreFileFilter.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsIgnore; import com.intellij.cvsSupport2.cvsIgnore.IgnoredFilesInfo; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoreFileFilterBasedOnCvsEntriesManager.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoreFileFilterBasedOnCvsEntriesManager.java index 81dec32f4e..8132ceed9b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoreFileFilterBasedOnCvsEntriesManager.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoreFileFilterBasedOnCvsEntriesManager.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsIgnore; import com.intellij.cvsSupport2.application.CvsEntriesManager; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoredFilesInfo.java similarity index 54% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoredFilesInfo.java index f044a3bc10..eb9cace112 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoredFilesInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package com.intellij.cvsSupport2.cvsIgnore; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface IgnoredFilesInfo { + + IgnoredFilesInfo IGNORE_NOTHING = new IgnoredFilesInfo() { + public boolean shouldBeIgnored(String fileName) { + return false; + } + }; + + IgnoredFilesInfo IGNORE_ALL = new IgnoredFilesInfo() { + public boolean shouldBeIgnored(String fileName) { + return true; + } + }; + + boolean shouldBeIgnored(String fileName); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoredFilesInfoImpl.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoredFilesInfoImpl.java index d2369f8da6..3df15f4f31 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoredFilesInfoImpl.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/IgnoredFilesInfoImpl.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsIgnore; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/UserDirIgnores.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/UserDirIgnores.java index 4cb541d7f0..2ecaf24340 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/UserDirIgnores.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsIgnore/UserDirIgnores.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsIgnore; import com.intellij.cvsSupport2.util.CvsVfsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AbstractCvsHandler.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AbstractCvsHandler.java index e26b9fc4db..8189962cfe 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AbstractCvsHandler.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AbstractCvsHandler.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvshandlers; import com.intellij.cvsSupport2.cvsoperations.cvsMessages.CvsMessagesListener; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AllFilesInProject.java similarity index 55% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AllFilesInProject.java index e1da04a96a..10f0bd3bb5 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AllFilesInProject.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.cvsSupport2.cvshandlers; -package com.intellij.lang.ant.config; +import com.intellij.openapi.vfs.VirtualFileManager; -import com.intellij.openapi.vfs.VirtualFile; +/** + * author: lesya + */ +class AllFilesInProject extends FileSetToBeUpdated{ -public class AntNoFileException extends Exception { - private final VirtualFile myFile; + public AllFilesInProject() { + } - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; + public void refreshFilesAsync(Runnable postRunnable) { + VirtualFileManager.getInstance().refresh(true, postRunnable); } - public VirtualFile getFile() { - return myFile; + public void refreshFilesSync() { + VirtualFileManager.getInstance().refresh(false); } } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AnyProcessedFiles.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AnyProcessedFiles.java index 7c79653aa7..a0ad23cb7e 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AnyProcessedFiles.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/AnyProcessedFiles.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvshandlers; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CheckoutHandler.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CheckoutHandler.java index cfc962ea89..eeea8ac917 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CheckoutHandler.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CheckoutHandler.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvshandlers; import com.intellij.cvsSupport2.config.CvsConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CommandCvsHandler.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CommandCvsHandler.java index cb2270eb07..64f0c35953 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CommandCvsHandler.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CommandCvsHandler.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvshandlers; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsHandler.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsHandler.java index 027dfd9336..c6416f65d7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsHandler.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsHandler.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvshandlers; import com.intellij.cvsSupport2.cvsExecution.ModalityContext; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsMessagePattern.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsMessagePattern.java index c40150a42d..176b16518a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsMessagePattern.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsMessagePattern.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvshandlers; import com.intellij.util.PatternUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsMessagesConsole.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsMessagesConsole.java index f315013574..d53ba9f8bf 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsMessagesConsole.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsMessagesConsole.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvshandlers; import com.intellij.util.ui.EditorAdapter; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsUpdatePolicy.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsUpdatePolicy.java index 945d9eea61..267fa578ac 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsUpdatePolicy.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/CvsUpdatePolicy.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.cvsSupport2.cvshandlers; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/FileSetToBeUpdated.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/FileSetToBeUpdated.java index 0772a34702..81fcd69db7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/FileSetToBeUpdated.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/FileSetToBeUpdated.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvshandlers; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/IOFilesBasedDirectoryPruner.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/IOFilesBasedDirectoryPruner.java index b05d2bdcf9..7c3e65de4a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/IOFilesBasedDirectoryPruner.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/IOFilesBasedDirectoryPruner.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvshandlers; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/SelectedFiles.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/SelectedFiles.java index a33aab8e0c..c89d9792cd 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/SelectedFiles.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/SelectedFiles.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvshandlers; import com.intellij.openapi.vcs.FilePath; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/UpdateHandler.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/UpdateHandler.java index a518eee737..dc3927799f 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/UpdateHandler.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvshandlers/UpdateHandler.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvshandlers; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CompositeOperaton.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CompositeOperaton.java index cc5bcfdde1..85a87b01ad 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CompositeOperaton.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CompositeOperaton.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.common; import com.intellij.cvsSupport2.application.CvsEntriesManager; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CreateFileObjects.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CreateFileObjects.java index d0ff0e90f6..d0e415c0aa 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CreateFileObjects.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CreateFileObjects.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.common; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsCommandOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsCommandOperation.java index 14d288a0f0..f19f785f67 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsCommandOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsCommandOperation.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.cvsSupport2.cvsoperations.common; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsExecutionEnvironment.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsExecutionEnvironment.java index 3f144a8415..1921ac4ef3 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsExecutionEnvironment.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsExecutionEnvironment.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.common; import com.intellij.cvsSupport2.cvsExecution.ModalityContext; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsOperation.java index 3e9e5a42b7..1967c444fa 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.common; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsOperationOnFiles.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsOperationOnFiles.java index 524489972a..519e812ace 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsOperationOnFiles.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/CvsOperationOnFiles.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.common; import com.intellij.cvsSupport2.application.CvsEntriesManager; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/FindAllRoots.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/FindAllRoots.java index 57561ef762..117008ec49 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/FindAllRoots.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/FindAllRoots.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.common; import com.intellij.cvsSupport2.application.CvsEntriesManager; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LocalPathIndifferentOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LocalPathIndifferentOperation.java index 99cbb86e70..9af646f523 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LocalPathIndifferentOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LocalPathIndifferentOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.common; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LocalPathIndifferentOperationHelper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LocalPathIndifferentOperationHelper.java index 3786e59272..10c6fe6eb6 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LocalPathIndifferentOperationHelper.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LocalPathIndifferentOperationHelper.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.common; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LoginPerformer.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LoginPerformer.java index 089c3f53dd..f9238f4ddf 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LoginPerformer.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/LoginPerformer.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.common; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/devkit/src/util/ActionData.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/PostCvsActivity.java similarity index 50% copy from plugins/devkit/src/util/ActionData.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/PostCvsActivity.java index 04c436af9c..d6117f58c1 100644 --- a/plugins/devkit/src/util/ActionData.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/PostCvsActivity.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. @@ -13,34 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.idea.devkit.util; +package com.intellij.cvsSupport2.cvsoperations.common; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.NotNull; +import com.intellij.cvsSupport2.cvsoperations.cvsUpdate.MergedWithConflictProjectOrModuleFile; /** - * @author swr + * author: lesya */ -public interface ActionData { - @NotNull - String getActionId(); +public interface PostCvsActivity { + PostCvsActivity DEAF = new PostCvsActivity() { + public void registerCorruptedProjectOrModuleFile(MergedWithConflictProjectOrModuleFile mergedWithConflictProjectOrModuleFile) { + } - @NotNull - String getActionText(); + }; - String getActionDescription(); + void registerCorruptedProjectOrModuleFile(MergedWithConflictProjectOrModuleFile mergedWithConflictProjectOrModuleFile); - @Nullable - String getSelectedGroupId(); - - @Nullable - String getSelectedActionId(); - - String getSelectedAnchor(); - - @Nullable - String getFirstKeyStroke(); - - @Nullable - String getSecondKeyStroke(); } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/ReceivedFileProcessor.java similarity index 56% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/ReceivedFileProcessor.java index e1da04a96a..4f1c48c8d0 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/ReceivedFileProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.intellij.lang.ant.config; +package com.intellij.cvsSupport2.cvsoperations.common; import com.intellij.openapi.vfs.VirtualFile; -public class AntNoFileException extends Exception { - private final VirtualFile myFile; +import java.io.File; +import java.io.IOException; - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; - } +/** + * author: lesya + */ +public interface ReceivedFileProcessor { + ReceivedFileProcessor DEFAULT = new ReceivedFileProcessor() { + public boolean shouldProcess(VirtualFile virtualFile, File targetFile) { + return true; + } + }; - public VirtualFile getFile() { - return myFile; - } + boolean shouldProcess(VirtualFile virtualFile, File targetFile) throws IOException; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/RepositoryModificationOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/RepositoryModificationOperation.java index 4f32a4f82f..30492e4630 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/RepositoryModificationOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/RepositoryModificationOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.common; import com.intellij.cvsSupport2.config.CvsConfiguration; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/RepositoryPathProvider.java similarity index 71% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/RepositoryPathProvider.java index f044a3bc10..c9c5948ffe 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/RepositoryPathProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.cvsoperations.common; + -import com.intellij.psi.PsiElement; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface RepositoryPathProvider { + String getRepositoryPath(String repository); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/UpdatedFilesManager.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/UpdatedFilesManager.java index 12efdfc631..c8cb551bcd 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/UpdatedFilesManager.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/common/UpdatedFilesManager.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.common; import com.intellij.cvsSupport2.application.CvsEntriesManager; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddFileOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddFileOperation.java index efb195f716..62fe1b7dec 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddFileOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddFileOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsAdd; import com.intellij.cvsSupport2.connections.CvsRootProvider; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddFilesOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddFilesOperation.java index 0efdc6abf2..e09b4ae140 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddFilesOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddFilesOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsAdd; import com.intellij.cvsSupport2.cvsoperations.common.CompositeOperaton; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddedFileInfo.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddedFileInfo.java index 256a0ae1d9..ec770ec005 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddedFileInfo.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddedFileInfo.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.cvsSupport2.cvsoperations.cvsAdd; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AbstractAddFileConfirmationPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AbstractAddFileConfirmationPanel.java index 6694b1206a..05ec846db0 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AbstractAddFileConfirmationPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AbstractAddFileConfirmationPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsAdd.ui; import com.intellij.cvsSupport2.cvsoperations.cvsAdd.AddedFileInfo; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AbstractAddOptionsDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AbstractAddOptionsDialog.java index 5721e83315..2ba92d2b90 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AbstractAddOptionsDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AbstractAddOptionsDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsAdd.ui; import com.intellij.cvsSupport2.cvsoperations.cvsAdd.AddedFileInfo; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddDirectoryConfirmationPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddDirectoryConfirmationPanel.java index 707f69efbb..76b063fc3a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddDirectoryConfirmationPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddDirectoryConfirmationPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsAdd.ui; import com.intellij.cvsSupport2.cvsoperations.cvsAdd.AddedFileInfo; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddFileConfirmationPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddFileConfirmationPanel.java index b7dad956ad..9744b66c41 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddFileConfirmationPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddFileConfirmationPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsAdd.ui; import com.intellij.cvsSupport2.cvsoperations.cvsAdd.AddedFileInfo; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddMultiplyFilesOptionsDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddMultiplyFilesOptionsDialog.java index 31aa182fd7..e1368251aa 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddMultiplyFilesOptionsDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddMultiplyFilesOptionsDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsAdd.ui; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddOneFileOptionsDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddOneFileOptionsDialog.java index 474847dc3a..a4be4e6321 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddOneFileOptionsDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddOneFileOptionsDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsAdd.ui; import com.intellij.cvsSupport2.cvsoperations.cvsAdd.AddedFileInfo; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddedFileCellRenderer.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddedFileCellRenderer.java index a9c527170c..372a646413 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddedFileCellRenderer.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddedFileCellRenderer.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsAdd.ui; import com.intellij.cvsSupport2.cvsoperations.cvsAdd.AddedFileInfo; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAnnotate/AnnotateOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAnnotate/AnnotateOperation.java index 0785afef74..5e55fdff69 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAnnotate/AnnotateOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAnnotate/AnnotateOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsAnnotate; import com.intellij.cvsSupport2.application.CvsEntriesManager; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAnnotate/Annotation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAnnotate/Annotation.java index 14d91b6325..3d90cded01 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAnnotate/Annotation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAnnotate/Annotation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsAnnotate; import com.intellij.util.text.SyncDateFormat; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutAdminReader.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutAdminReader.java index 3921094fd8..f299d3e1a1 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutAdminReader.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutAdminReader.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsCheckOut; import org.netbeans.lib.cvsclient.admin.AdminReader; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutAdminWriter.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutAdminWriter.java index a4ab4e6259..d2fb3898d0 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutAdminWriter.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutAdminWriter.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsCheckOut; import com.intellij.util.containers.SLRUCache; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutFileByRevisionOperation.java similarity index 55% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutFileByRevisionOperation.java index e1da04a96a..8d2ec6940d 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutFileByRevisionOperation.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.intellij.lang.ant.config; +package com.intellij.cvsSupport2.cvsoperations.cvsCheckOut; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.cvsSupport2.cvsoperations.dateOrRevision.SimpleRevision; -public class AntNoFileException extends Exception { - private final VirtualFile myFile; - - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; - } - - public VirtualFile getFile() { - return myFile; +/** + * author: lesya + */ +public class CheckoutFileByRevisionOperation extends CheckoutFileOperation{ + public CheckoutFileByRevisionOperation(VirtualFile parent, String fileName, String revision, boolean makeNewFilesReadOnly) { + super(parent, new SimpleRevision(revision), fileName, makeNewFilesReadOnly); } } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutFileOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutFileOperation.java index a4666fe4af..a820cd797f 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutFileOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutFileOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsCheckOut; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutFilesOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutFilesOperation.java index 3185647162..66f603b3bb 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutFilesOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutFilesOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsCheckOut; import com.intellij.cvsSupport2.application.CvsEntriesManager; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutProjectOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutProjectOperation.java index 2bc864ab01..6506aab75a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutProjectOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutProjectOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsCheckOut; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/CheckoutFileDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/CheckoutFileDialog.java index cb01ca2f4a..d69ebaaed2 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/CheckoutFileDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/CheckoutFileDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsCheckOut.ui; import com.intellij.cvsSupport2.CvsVcs2; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/FileCellRenderer.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/FileCellRenderer.java dissimilarity index 72% index e8ff711770..d1c1647620 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/FileCellRenderer.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/FileCellRenderer.java @@ -1,54 +1,38 @@ -/* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - * - */ -package com.intellij.cvsSupport2.cvsoperations.cvsCheckOut.ui; - -import com.intellij.cvsSupport2.ui.AbstractListCellRenderer; -import com.intellij.openapi.util.IconLoader; - -import javax.swing.*; -import java.io.File; - -/** - * author: lesya - */ - -public class FileCellRenderer extends AbstractListCellRenderer { - private static final Icon ICON = IconLoader.getIcon("/nodes/enterpriseProject.png"); - - protected String getPresentableString(Object value) { - return ((File) value).getAbsolutePath(); - } - - protected Icon getPresentableIcon(Object value) { - return ICON; - } -} +/* + * 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.cvsSupport2.cvsoperations.cvsCheckOut.ui; + +import com.intellij.cvsSupport2.ui.AbstractListCellRenderer; +import com.intellij.openapi.util.IconLoader; + +import javax.swing.*; +import java.io.File; + +/** + * author: lesya + */ + +public class FileCellRenderer extends AbstractListCellRenderer { + private static final Icon ICON = IconLoader.getIcon("/nodes/enterpriseProject.png"); + + protected String getPresentableString(Object value) { + return ((File) value).getAbsolutePath(); + } + + protected Icon getPresentableIcon(Object value) { + return ICON; + } +} diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCommit/CommitFilesOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCommit/CommitFilesOperation.java index c72c3dff0e..fd087400bf 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCommit/CommitFilesOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCommit/CommitFilesOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsCommit; import com.intellij.cvsSupport2.connections.CvsRootProvider; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/DirectoryContent.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/DirectoryContent.java index 503918f170..bb99c07f95 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/DirectoryContent.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/DirectoryContent.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsContent; import com.intellij.util.containers.HashSet; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/DirectoryContentListener.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/DirectoryContentListener.java index 7ed337a596..3472a8f7ae 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/DirectoryContentListener.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/DirectoryContentListener.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsContent; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/DirectoryContentProvider.java similarity index 67% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/DirectoryContentProvider.java index f044a3bc10..22ad463d54 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/DirectoryContentProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.cvsoperations.cvsContent; + +import com.intellij.cvsSupport2.cvsoperations.cvsContent.DirectoryContent; -import com.intellij.psi.PsiElement; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface DirectoryContentProvider { + DirectoryContent getDirectoryContent(); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetDirectoriesListViaUpdateOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetDirectoriesListViaUpdateOperation.java index 5be1b0b2f8..8623da15b6 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetDirectoriesListViaUpdateOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetDirectoriesListViaUpdateOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsContent; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetFileContentOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetFileContentOperation.java index b0f1134bdc..44ba6892f3 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetFileContentOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetFileContentOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsContent; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetModuleContentOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetModuleContentOperation.java index 7860eca955..881a3919c3 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetModuleContentOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetModuleContentOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsContent; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetModulesListOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetModulesListOperation.java index e2ef697216..79b56f1fc4 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetModulesListOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsContent/GetModulesListOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsContent; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditOperation.java index 0929db92b7..262ec9be3d 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsEdit; import com.intellij.cvsSupport2.connections.CvsRootProvider; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditorInfo.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditorInfo.java index bb020a32a8..a40c72077a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditorInfo.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditorInfo.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsEdit; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditorsOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditorsOperation.java index be7de2b81c..c8a8d559b5 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditorsOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/EditorsOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsEdit; import com.intellij.cvsSupport2.connections.CvsRootProvider; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/UneditOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/UneditOperation.java index 37cfd39bf1..f18f4b3287 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/UneditOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/UneditOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsEdit; import com.intellij.cvsSupport2.connections.CvsRootProvider; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/ui/EditCvsConfigurationFieldByFieldDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/ui/EditCvsConfigurationFieldByFieldDialog.java index 992db86a79..82352d239e 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/ui/EditCvsConfigurationFieldByFieldDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/ui/EditCvsConfigurationFieldByFieldDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsEdit.ui; import com.intellij.cvsSupport2.config.ui.CvsRootFieldByFieldConfigurationPanel; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/ui/EditOptionsDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/ui/EditOptionsDialog.java index d9b809470b..14f3378336 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/ui/EditOptionsDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/ui/EditOptionsDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsEdit.ui; import com.intellij.cvsSupport2.CvsVcs2; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/ui/EditorsPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/ui/EditorsPanel.java index 8083bc5d14..5ea637267a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/ui/EditorsPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsEdit/ui/EditorsPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsEdit.ui; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsErrors/ErrorMessagesProcessor.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsErrors/ErrorMessagesProcessor.java index 82b035d0b6..7e1475c78d 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsErrors/ErrorMessagesProcessor.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsErrors/ErrorMessagesProcessor.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsErrors; import com.intellij.cvsSupport2.errorHandling.CvsException; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsErrors/ErrorProcessor.java similarity index 64% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsErrors/ErrorProcessor.java index f044a3bc10..7fd3d84127 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsErrors/ErrorProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.cvsoperations.cvsErrors; -import com.intellij.psi.PsiElement; +import com.intellij.openapi.vcs.VcsException; + +import java.util.List; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface ErrorProcessor { + + void addError(VcsException ex); + void addWarning(VcsException ex); + List getErrors(); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsImport/ImportDetails.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsImport/ImportDetails.java index 99fe323093..60de9d5e74 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsImport/ImportDetails.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsImport/ImportDetails.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsImport; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsImport/ImportOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsImport/ImportOperation.java index 189971b97c..303232aa57 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsImport/ImportOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsImport/ImportOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsImport; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsLog/LocalPathIndifferentLogOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsLog/LocalPathIndifferentLogOperation.java index 1999e73beb..bfdd831529 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsLog/LocalPathIndifferentLogOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsLog/LocalPathIndifferentLogOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsLog; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsLog/LogOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsLog/LogOperation.java index 3762f1150b..b02a193012 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsLog/LogOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsLog/LogOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsLog; import com.intellij.cvsSupport2.connections.CvsRootProvider; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsCompositeListener.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsCompositeListener.java index a4a8c7dab2..de4daec5f6 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsCompositeListener.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsCompositeListener.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsMessages; import org.netbeans.lib.cvsclient.file.ICvsFileSystem; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsListenerWithProgress.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsListenerWithProgress.java index aee9e9b13f..a66e073730 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsListenerWithProgress.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsListenerWithProgress.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsMessages; import com.intellij.cvsSupport2.errorHandling.CvsProcessException; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsListenersCollection.java similarity index 70% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsListenersCollection.java index f044a3bc10..6b83576455 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsListenersCollection.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.cvsoperations.cvsMessages; -import com.intellij.psi.PsiElement; +import java.util.Collection; -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface CvsListenersCollection { + void addCvsListener(CvsMessagesListener listener); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsMessagesAdapter.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsMessagesAdapter.java index b5bd5b97a0..4f6c9185ae 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsMessagesAdapter.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsMessagesAdapter.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsMessages; import com.intellij.cvsSupport2.cvsoperations.cvsMessages.MessageEvent; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsMessagesListener.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsMessagesListener.java index 3d9a258955..cfb2b54a3d 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsMessagesListener.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsMessagesListener.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsMessages; import org.netbeans.lib.cvsclient.file.ICvsFileSystem; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsMessagesTranslator.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsMessagesTranslator.java index 15f18f7f22..72106b2b4d 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsMessagesTranslator.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/CvsMessagesTranslator.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsMessages; import com.intellij.cvsSupport2.application.CvsEntriesManager; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/FileMessage.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/FileMessage.java index f7465a8797..e32b70b0d7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/FileMessage.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/FileMessage.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsMessages; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/git4idea/src/git4idea/commands/GitLineHandlerAdapter.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/MessageEvent.java similarity index 50% copy from plugins/git4idea/src/git4idea/commands/GitLineHandlerAdapter.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/MessageEvent.java index fc9ae33260..e75dbbbb6a 100644 --- a/plugins/git4idea/src/git4idea/commands/GitLineHandlerAdapter.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsMessages/MessageEvent.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. @@ -13,32 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package git4idea.commands; - -import com.intellij.openapi.util.Key; +package com.intellij.cvsSupport2.cvsoperations.cvsMessages; /** - * An adapter for line handler + * author: lesya */ -public class GitLineHandlerAdapter implements GitLineHandlerListener { - /** - * {@inheritDoc} - */ - public void onLineAvailable(final String line, final Key outputType) { - // do nothing +public class MessageEvent { + private final String myMessage; + private final boolean myIsError; + private final boolean myIsTagged; + + public MessageEvent(String message, boolean isError, boolean isTagged) { + myMessage = message; + myIsError = isError; + myIsTagged = isTagged; + } + + public String getMessage() { + return myMessage; } - /** - * {@inheritDoc} - */ - public void processTerminated(final int exitCode) { - // do nothing + public boolean isError() { + return myIsError; } - /** - * {@inheritDoc} - */ - public void startFailed(final Throwable exception) { - // do nothing + public boolean isTagged() { + return myIsTagged; } } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsRemove/RemoveFilesOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsRemove/RemoveFilesOperation.java index d882110f21..f1df07592c 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsRemove/RemoveFilesOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsRemove/RemoveFilesOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsRemove; import com.intellij.cvsSupport2.connections.CvsRootProvider; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsStatus/StatusOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsStatus/StatusOperation.java index b9f4deb482..309433bb27 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsStatus/StatusOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsStatus/StatusOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsStatus; import com.intellij.cvsSupport2.connections.CvsRootProvider; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/BranchOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/BranchOperation.java index 6015ae0773..8f2df645f5 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/BranchOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/BranchOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsTagOrBranch; import com.intellij.cvsSupport2.connections.CvsRootProvider; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/BranchesProvider.java similarity index 63% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/BranchesProvider.java index f044a3bc10..1c9774b673 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/BranchesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.cvsoperations.cvsTagOrBranch; -import com.intellij.psi.PsiElement; +import com.intellij.cvsSupport2.history.CvsRevisionNumber; + +import java.util.Collection; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface BranchesProvider { + Collection getAllBranches(); + + Collection getAllRevisions(); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/GetAllBranchesOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/GetAllBranchesOperation.java index ce157a779f..579515c088 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/GetAllBranchesOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/GetAllBranchesOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsTagOrBranch; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/RTagOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/RTagOperation.java index dd7eccadb5..f6653ec01a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/RTagOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/RTagOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsTagOrBranch; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/RtagCommand.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/RtagCommand.java index 45da04244b..5c66f0a7a7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/RtagCommand.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/RtagCommand.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsTagOrBranch; import com.intellij.openapi.util.text.StringUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagOperation.java index 1f4e4c9122..f30ae24468 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsTagOrBranch; import com.intellij.cvsSupport2.connections.CvsRootProvider; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsHelper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsHelper.java index 7247f60167..9cbfd5bac7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsHelper.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsHelper.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsTagOrBranch; import com.intellij.CvsBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsProvider.java similarity index 61% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsProvider.java index f044a3bc10..9e65c948c4 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.cvsoperations.cvsTagOrBranch; -import com.intellij.psi.PsiElement; +import com.intellij.openapi.vcs.VcsException; +import com.intellij.cvsSupport2.cvsoperations.common.CvsCommandOperation; + +import java.util.Collection; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface TagsProvider { + CvsCommandOperation getOperation() throws VcsException; } diff --git a/plugins/devkit/src/util/ActionData.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsProviderOnEnvironment.java similarity index 53% copy from plugins/devkit/src/util/ActionData.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsProviderOnEnvironment.java index 04c436af9c..5cd4de75a2 100644 --- a/plugins/devkit/src/util/ActionData.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsProviderOnEnvironment.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. @@ -13,34 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.idea.devkit.util; +package com.intellij.cvsSupport2.cvsoperations.cvsTagOrBranch; -import org.jetbrains.annotations.Nullable; +import com.intellij.cvsSupport2.connections.CvsEnvironment; +import com.intellij.cvsSupport2.cvsoperations.common.CvsCommandOperation; +import com.intellij.openapi.vcs.VcsException; import org.jetbrains.annotations.NotNull; /** - * @author swr + * author: lesya */ -public interface ActionData { - @NotNull - String getActionId(); +public abstract class TagsProviderOnEnvironment implements TagsProvider{ + public CvsCommandOperation getOperation() throws VcsException { + return new GetAllBranchesOperation(getEnv()); + } @NotNull - String getActionText(); - - String getActionDescription(); - - @Nullable - String getSelectedGroupId(); - - @Nullable - String getSelectedActionId(); - - String getSelectedAnchor(); - - @Nullable - String getFirstKeyStroke(); + protected abstract CvsEnvironment getEnv(); - @Nullable - String getSecondKeyStroke(); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsProviderOnVirtualFiles.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsProviderOnVirtualFiles.java index b42ca1742d..a1117f0c1d 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsProviderOnVirtualFiles.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/TagsProviderOnVirtualFiles.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsTagOrBranch; import com.intellij.cvsSupport2.cvsoperations.cvsLog.LogOperation; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/CreateTagDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/CreateTagDialog.java index a07bc19cac..104ab9e5c7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/CreateTagDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/CreateTagDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsTagOrBranch.ui; import com.intellij.CvsBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/CvsTagDialog.java similarity index 55% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/CvsTagDialog.java index e1da04a96a..5cb3d0f30c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/CvsTagDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.cvsSupport2.cvsoperations.cvsTagOrBranch.ui; -package com.intellij.lang.ant.config; +import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.openapi.vfs.VirtualFile; - -public class AntNoFileException extends Exception { - private final VirtualFile myFile; +/** + * author: lesya + */ +public abstract class CvsTagDialog extends DialogWrapper implements TagNameFieldOwner { + public CvsTagDialog() { + super(true); + } - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; + public void enableOkAction(){ + setOKActionEnabled(true); } - public VirtualFile getFile() { - return myFile; + public void disableOkAction(String errorMeesage){ + setOKActionEnabled(false); } + } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/DeleteTagDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/DeleteTagDialog.java index 98295fd1d8..e6ba1d4976 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/DeleteTagDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/DeleteTagDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsTagOrBranch.ui; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/SelectTagDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/SelectTagDialog.java index 4de7e8acea..8912688ce2 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/SelectTagDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/SelectTagDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsTagOrBranch.ui; import com.intellij.CvsBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagNameFieldOwner.java similarity index 69% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagNameFieldOwner.java index f044a3bc10..17512496f9 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagNameFieldOwner.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.cvsoperations.cvsTagOrBranch.ui; -import com.intellij.psi.PsiElement; +public interface TagNameFieldOwner { + void enableOkAction(); -/** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); -} + void disableOkAction(String errorMeesage); + + boolean tagFieldIsActive(); +} \ No newline at end of file diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagsPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagsPanel.java index 9ef3f883d7..58e83d013a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagsPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsTagOrBranch/ui/TagsPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsTagOrBranch.ui; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/MergedWithConflictProjectOrModuleFile.java similarity index 52% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/MergedWithConflictProjectOrModuleFile.java index e1da04a96a..516ed39863 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/MergedWithConflictProjectOrModuleFile.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.intellij.lang.ant.config; +package com.intellij.cvsSupport2.cvsoperations.cvsUpdate; import com.intellij.openapi.vfs.VirtualFile; -public class AntNoFileException extends Exception { - private final VirtualFile myFile; +public class MergedWithConflictProjectOrModuleFile { + private final VirtualFile myOriginal; + private boolean myShouldBeCheckedOut = false; + + public MergedWithConflictProjectOrModuleFile(VirtualFile original) { + myOriginal = original; + } + + public VirtualFile getOriginal() { + return myOriginal; + } - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; + public void setShouldBeCheckedOut() { + myShouldBeCheckedOut = true; } - public VirtualFile getFile() { - return myFile; + public boolean shouldBeCheckedOut() { + return myShouldBeCheckedOut; } -} +} \ No newline at end of file diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/UpdateOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/UpdateOperation.java index 1c4da2ea8f..dbe050e173 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/UpdateOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/UpdateOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsUpdate; import com.intellij.cvsSupport2.CvsVcs2; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/UpdateReceivedFileProcessor.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/UpdateReceivedFileProcessor.java index b8b3341ddb..75d13422dd 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/UpdateReceivedFileProcessor.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/UpdateReceivedFileProcessor.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsUpdate; import com.intellij.cvsSupport2.application.CvsEntriesManager; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java index e2aec9c2d1..5d71da8913 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsUpdate.ui; import com.intellij.cvsSupport2.config.CvsConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/UpdateOptionsPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/UpdateOptionsPanel.java index de5ab2b7b5..1282fc5fd8 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/UpdateOptionsPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/UpdateOptionsPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsUpdate.ui; import com.intellij.cvsSupport2.config.CvsConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/WatchOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/WatchOperation.java index 5686d333eb..c0993f36c8 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/WatchOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/WatchOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsWatch; import com.intellij.cvsSupport2.connections.CvsRootProvider; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/WatcherInfo.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/WatcherInfo.java index 871c8cd3ed..fb490efd14 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/WatcherInfo.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/WatcherInfo.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsWatch; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/WatchersOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/WatchersOperation.java index 093fd20bbd..b4c793bc64 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/WatchersOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/WatchersOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsWatch; import com.intellij.cvsSupport2.connections.CvsRootProvider; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/ui/WatcherDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/ui/WatcherDialog.java index 7f773d94fe..4d985b1aa8 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/ui/WatcherDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/ui/WatcherDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsWatch.ui; import com.intellij.openapi.ui.DialogWrapper; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/ui/WatchersPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/ui/WatchersPanel.java index 7b6768c7f5..8fbaee772f 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/ui/WatchersPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsWatch/ui/WatchersPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsWatch.ui; import com.intellij.cvsSupport2.cvsoperations.cvsWatch.WatcherInfo; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/CommandWrapper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/CommandWrapper.java index a2f526d759..eb5e1a36fc 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/CommandWrapper.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/CommandWrapper.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.dateOrRevision; import org.netbeans.lib.cvsclient.command.Command; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/RevisionOrDateImpl.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/RevisionOrDateImpl.java index fd2fc9be1c..3c1a461635 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/RevisionOrDateImpl.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/RevisionOrDateImpl.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.dateOrRevision; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/SimpleRevision.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/SimpleRevision.java index 84eb19fb04..ce5f0d6c63 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/SimpleRevision.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/SimpleRevision.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.dateOrRevision; import com.intellij.cvsSupport2.application.CvsEntriesManager; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/DateOrRevisionOrTagSettings.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/DateOrRevisionOrTagSettings.java index 0c3a8d1a18..5c85185e9e 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/DateOrRevisionOrTagSettings.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/dateOrRevision/ui/DateOrRevisionOrTagSettings.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.dateOrRevision.ui; import com.intellij.cvsSupport2.config.DateOrRevisionSettings; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderForLightFiles.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderForLightFiles.java index 0af72409cf..8c24c2f43b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderForLightFiles.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderForLightFiles.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.javacvsSpecificImpls; import java.io.File; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderOnCache.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderOnCache.java index 7a2ff1fc31..7ba8c82730 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderOnCache.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderOnCache.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.javacvsSpecificImpls; import com.intellij.cvsSupport2.application.CvsEntriesManager; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderOnStoredRepositoryPath.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderOnStoredRepositoryPath.java index ff36161840..85e091e738 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderOnStoredRepositoryPath.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminReaderOnStoredRepositoryPath.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.javacvsSpecificImpls; import org.netbeans.lib.cvsclient.admin.IAdminReader; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterOnCache.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterOnCache.java index 23ca2092ed..32400daadd 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterOnCache.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterOnCache.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.javacvsSpecificImpls; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterStoringRepositoryPath.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterStoringRepositoryPath.java index 7b5c2adb1e..19530d3e2f 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterStoringRepositoryPath.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterStoringRepositoryPath.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.javacvsSpecificImpls; import org.netbeans.lib.cvsclient.CvsRoot; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/ConstantLocalFileReader.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/ConstantLocalFileReader.java index 59fac7a0f7..364955fbdb 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/ConstantLocalFileReader.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/ConstantLocalFileReader.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.javacvsSpecificImpls; import org.netbeans.lib.cvsclient.file.*; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/DeafAdminReader.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/DeafAdminReader.java index 725f09b18e..c921deb1e9 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/DeafAdminReader.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/DeafAdminReader.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.javacvsSpecificImpls; import org.netbeans.lib.cvsclient.admin.IAdminReader; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/DeafAdminWriter.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/DeafAdminWriter.java index 3b93729519..d27734ede3 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/DeafAdminWriter.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/DeafAdminWriter.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.javacvsSpecificImpls; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsChangeProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsChangeProvider.java index 8ddbcbe6ad..714781baa7 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsChangeProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsChangeProvider.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsstatuses; import com.intellij.CvsBundle; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsEntriesListener.java similarity index 67% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsEntriesListener.java index f044a3bc10..679795041e 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsEntriesListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.cvsstatuses; -import com.intellij.psi.PsiElement; +import com.intellij.openapi.vfs.VirtualFile; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); + +public interface CvsEntriesListener { + void entriesChanged(VirtualFile parent); + + void entryChanged(VirtualFile file); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsStatusProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsStatusProvider.java index 6a5f27b6ea..b03453f6a9 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsStatusProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsstatuses/CvsStatusProvider.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsstatuses; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/CannotFindCvsRootException.java similarity index 60% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/CannotFindCvsRootException.java index f044a3bc10..ad4c2b8d04 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/CannotFindCvsRootException.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.errorHandling; -import com.intellij.psi.PsiElement; +import java.io.File; +import java.text.MessageFormat; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); -} + +public class CannotFindCvsRootException extends Exception{ + public CannotFindCvsRootException(File file) { + super(com.intellij.CvsBundle.message("exception.text.cannot.find.cvsroot.for.file", file)); + } + } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/CvsException.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/CvsException.java index cac14ecc1f..5784163c32 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/CvsException.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/CvsException.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.errorHandling; import com.intellij.openapi.vcs.VcsException; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/CvsProcessException.java similarity index 70% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/CvsProcessException.java index f044a3bc10..7b9807062e 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/CvsProcessException.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package com.intellij.cvsSupport2.errorHandling; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class CvsProcessException extends RuntimeException{ + public CvsProcessException(String message) { + super(message); + } } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntConfigurationListener.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/InvalidModuleDescriptionException.java similarity index 60% copy from plugins/ant/src/com/intellij/lang/ant/config/AntConfigurationListener.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/InvalidModuleDescriptionException.java index 0dca8ce522..30dd228794 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntConfigurationListener.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/errorHandling/InvalidModuleDescriptionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,17 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.cvsSupport2.errorHandling; -package com.intellij.lang.ant.config; -import java.util.EventListener; +public class InvalidModuleDescriptionException extends RuntimeException{ + private final String myCvsRoot; -public interface AntConfigurationListener extends EventListener { - void configurationLoaded(); - - void buildFileChanged(final AntBuildFile buildFile); + public InvalidModuleDescriptionException(String message, String cvsRoot) { + super(message); + myCvsRoot = cvsRoot; + } - void buildFileAdded(final AntBuildFile buildFile); - - void buildFileRemoved(final AntBuildFile buildFile); + public String getCvsRoot() { + return myCvsRoot; + } } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/ComparableVcsRevisionOnOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/ComparableVcsRevisionOnOperation.java index 82a3eb11e8..3090db44e4 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/ComparableVcsRevisionOnOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/ComparableVcsRevisionOnOperation.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.history; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileContent.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileContent.java index 31a25dccf7..e1d9d5f13e 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileContent.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileContent.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.history; import com.intellij.openapi.vcs.history.VcsRevisionNumber; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileRevision.java similarity index 62% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileRevision.java index f044a3bc10..4e8f582fac 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileRevision.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package com.intellij.cvsSupport2.history; -import com.intellij.psi.PsiElement; +import com.intellij.openapi.vcs.history.VcsFileRevision; + +import java.util.Collection; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface CvsFileRevision extends VcsFileRevision{ + + Collection getBranches(); + + String getState(); + + Collection getTags(); + } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileRevisionImpl.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileRevisionImpl.java index 3675591473..127c7dfe7e 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileRevisionImpl.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileRevisionImpl.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.history; import com.intellij.cvsSupport2.connections.CvsEnvironment; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsHistoryProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsHistoryProvider.java index 9d3915fa5f..cc45826a60 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsHistoryProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsHistoryProvider.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.history; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/CvsServicesImpl.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/CvsServicesImpl.java index f721f249d9..77f1367bd9 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/CvsServicesImpl.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/CvsServicesImpl.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.impl; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/ModuleChooser.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/ModuleChooser.java index ad5dfa376a..97dbd26eec 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/ModuleChooser.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/impl/ModuleChooser.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.impl; import com.intellij.cvsSupport2.cvsBrowser.CvsElement; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/CvsCommandStopper.java similarity index 57% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/CvsCommandStopper.java index e1da04a96a..7f99d886d9 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/CvsCommandStopper.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package com.intellij.cvsSupport2.javacvsImpl; -package com.intellij.lang.ant.config; +import org.netbeans.lib.cvsclient.ICvsCommandStopper; -import com.intellij.openapi.vfs.VirtualFile; +/** + * author: lesya + */ +public class CvsCommandStopper implements ICvsCommandStopper{ + private volatile boolean myPing; -public class AntNoFileException extends Exception { - private final VirtualFile myFile; + public boolean isAborted() { + myPing = true; + return false; + } - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; + public boolean isAlive() { + return myPing; } - public VirtualFile getFile() { - return myFile; + public void resetAlive() { + myPing = false; } } diff --git a/plugins/git4idea/src/git4idea/commands/GitLineHandlerAdapter.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/FileReadOnlyHandler.java similarity index 51% copy from plugins/git4idea/src/git4idea/commands/GitLineHandlerAdapter.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/FileReadOnlyHandler.java index fc9ae33260..fcb296e6fb 100644 --- a/plugins/git4idea/src/git4idea/commands/GitLineHandlerAdapter.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/FileReadOnlyHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. @@ -13,32 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package git4idea.commands; +package com.intellij.cvsSupport2.javacvsImpl; -import com.intellij.openapi.util.Key; +import org.netbeans.lib.cvsclient.file.IFileReadOnlyHandler; -/** - * An adapter for line handler - */ -public class GitLineHandlerAdapter implements GitLineHandlerListener { - /** - * {@inheritDoc} - */ - public void onLineAvailable(final String line, final Key outputType) { - // do nothing - } +import java.io.File; +import java.io.IOException; - /** - * {@inheritDoc} - */ - public void processTerminated(final int exitCode) { - // do nothing - } +import com.intellij.util.io.ReadOnlyAttributeUtil; - /** - * {@inheritDoc} - */ - public void startFailed(final Throwable exception) { - // do nothing +/** + * author: lesya + */ +public class FileReadOnlyHandler implements IFileReadOnlyHandler{ + public void setFileReadOnly(File file, boolean readOnly) throws IOException { + if (file.canWrite() != readOnly) return; + ReadOnlyAttributeUtil.setReadOnlyAttribute(file.getAbsolutePath(), readOnly); } } diff --git a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/ProjectContentInfoProvider.java similarity index 66% copy from plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/ProjectContentInfoProvider.java index 5ef412416e..918840e3b2 100644 --- a/plugins/cvs/cvs-core/src/com/intellij/openapi/cvsIntegration/DateOrRevision.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/ProjectContentInfoProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.openapi.cvsIntegration; +package com.intellij.cvsSupport2.javacvsImpl; +import com.intellij.openapi.vfs.VirtualFile; -public interface DateOrRevision { - public String getBranch(); - public boolean shouldUseBranch(); - public String getDate(); - public boolean shouldUseDate(); +import java.io.File; + +public interface ProjectContentInfoProvider { + boolean fileIsUnderProject(VirtualFile file); + boolean fileIsUnderProject(File file); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/DeafLocalFileWriter.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/DeafLocalFileWriter.java index d6f7194bb0..b5ddd10351 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/DeafLocalFileWriter.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/DeafLocalFileWriter.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.javacvsImpl.io; import org.netbeans.lib.cvsclient.file.*; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/LocalFileReaderBasedOnVFS.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/LocalFileReaderBasedOnVFS.java index 3e07565b69..e4f8174dce 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/LocalFileReaderBasedOnVFS.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/LocalFileReaderBasedOnVFS.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.javacvsImpl.io; import com.intellij.cvsSupport2.javacvsImpl.ProjectContentInfoProvider; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/OutputStreamWrapper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/OutputStreamWrapper.java index 0f9cfc11d4..991ff213ab 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/OutputStreamWrapper.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/OutputStreamWrapper.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.javacvsImpl.io; import java.io.IOException; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/ReceiveTextFilePreprocessor.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/ReceiveTextFilePreprocessor.java index 9f25aedf80..dcdda8339b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/ReceiveTextFilePreprocessor.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/ReceiveTextFilePreprocessor.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.javacvsImpl.io; import com.intellij.cvsSupport2.cvsoperations.common.ReceivedFileProcessor; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/SendTextFilePreprocessor.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/SendTextFilePreprocessor.java index 27f062d760..f53ba64974 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/SendTextFilePreprocessor.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/SendTextFilePreprocessor.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.javacvsImpl.io; import com.intellij.util.text.LineReader; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/StoringLineSeparatorsLocalFileWriter.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/StoringLineSeparatorsLocalFileWriter.java index df30b04ddf..82b9108826 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/StoringLineSeparatorsLocalFileWriter.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/StoringLineSeparatorsLocalFileWriter.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.javacvsImpl.io; import com.intellij.cvsSupport2.CvsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/StreamLogger.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/StreamLogger.java index 5d32621336..95450774a5 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/StreamLogger.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/StreamLogger.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.javacvsImpl.io; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/keywordSubstitution/KeywordSubstitutionListWithSelection.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/keywordSubstitution/KeywordSubstitutionListWithSelection.java index 1b8a59a781..0c11f02349 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/keywordSubstitution/KeywordSubstitutionListWithSelection.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/keywordSubstitution/KeywordSubstitutionListWithSelection.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.keywordSubstitution; import com.intellij.cvsSupport2.config.CvsConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/keywordSubstitution/KeywordSubstitutionWrapper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/keywordSubstitution/KeywordSubstitutionWrapper.java index 1df9d5e7e3..33a10ce0ef 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/keywordSubstitution/KeywordSubstitutionWrapper.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/keywordSubstitution/KeywordSubstitutionWrapper.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.keywordSubstitution; import org.netbeans.lib.cvsclient.command.KeywordSubstitution; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/AbstractListCellRenderer.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/AbstractListCellRenderer.java index ceaba1df03..458deffd2a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/AbstractListCellRenderer.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/AbstractListCellRenderer.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui; import org.jetbrains.annotations.Nullable; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/ChangeKeywordSubstitutionPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/ChangeKeywordSubstitutionPanel.java index 5db8c54e14..7331d275b3 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/ChangeKeywordSubstitutionPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/ChangeKeywordSubstitutionPanel.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui; import org.jetbrains.annotations.NonNls; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsRootChangeListener.java similarity index 71% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsRootChangeListener.java index f044a3bc10..658e256eb1 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsRootChangeListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package com.intellij.cvsSupport2.ui; /** - * @author dyoma + * author: lesya */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface CvsRootChangeListener { + void onCvsRootChanged(); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java index af59fa7663..cfdf79d7fb 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindowComponent.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindowComponent.java index 1a398e5500..0c4bdebf23 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindowComponent.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindowComponent.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui; import com.intellij.CommonBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/KeywordSubstitutionComboBoxWrapper.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/KeywordSubstitutionComboBoxWrapper.java index c041c1c424..1dfb88625b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/KeywordSubstitutionComboBoxWrapper.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/KeywordSubstitutionComboBoxWrapper.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui; import com.intellij.cvsSupport2.keywordSubstitution.KeywordSubstitutionListWithSelection; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/Options.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/Options.java index 47ed7b4683..122de08d56 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/Options.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/Options.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui; import com.intellij.cvsSupport2.CvsVcs2; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/RestoreDirectoriesConfirmationDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/RestoreDirectoriesConfirmationDialog.java index e956466862..19246b0396 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/RestoreDirectoriesConfirmationDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/RestoreDirectoriesConfirmationDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/SelectFileVersionDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/SelectFileVersionDialog.java index b5a1a8239f..14e97ff4de 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/SelectFileVersionDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/SelectFileVersionDialog.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui; import com.intellij.cvsSupport2.config.CvsConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/CvsWizard.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/CvsWizard.java index 4f146af856..9c6a7e2bd0 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/CvsWizard.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/CvsWizard.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui.experts; import com.intellij.ide.wizard.AbstractWizard; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectCVSConfigurationStep.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectCVSConfigurationStep.java index b582cc3c03..b9623c737c 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectCVSConfigurationStep.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectCVSConfigurationStep.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui.experts; import com.intellij.cvsSupport2.config.CvsRootConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectCvsElementStep.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectCvsElementStep.java index cd4568ccef..6aebdad0d0 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectCvsElementStep.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectCvsElementStep.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui.experts; import com.intellij.cvsSupport2.config.CvsRootConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectLocationStep.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectLocationStep.java index 2114465466..79ad695166 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectLocationStep.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/SelectLocationStep.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui.experts; import com.intellij.cvsSupport2.util.CvsVfsUtil; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/WizardStep.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/WizardStep.java index 4db0a32213..b010c95a56 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/WizardStep.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/WizardStep.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui.experts; import com.intellij.ide.wizard.StepAdapter; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/CheckoutWizard.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/CheckoutWizard.java index dcca1dce2a..2c28bd1b38 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/CheckoutWizard.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/CheckoutWizard.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui.experts.checkout; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/ChooseCheckoutMode.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/ChooseCheckoutMode.java index 2c108baae9..3559ae2ac9 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/ChooseCheckoutMode.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/checkout/ChooseCheckoutMode.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui.experts.checkout; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/CustomizeKeywordSubstitutionStep.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/CustomizeKeywordSubstitutionStep.java index e76922d856..74d904beb2 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/CustomizeKeywordSubstitutionStep.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/CustomizeKeywordSubstitutionStep.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui.experts.importToCvs; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/CvsFieldValidator.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/CvsFieldValidator.java index 49b224c1bd..02d943fdc3 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/CvsFieldValidator.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/CvsFieldValidator.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui.experts.importToCvs; import com.intellij.cvsSupport2.cvsoperations.cvsTagOrBranch.ui.TagNameFieldOwner; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/FileExtension.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/FileExtension.java index b208d30afd..0ffdeec88a 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/FileExtension.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/FileExtension.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui.experts.importToCvs; import com.intellij.cvsSupport2.keywordSubstitution.KeywordSubstitutionListWithSelection; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportSettingsStep.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportSettingsStep.java index f2d0ded869..07bbacf548 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportSettingsStep.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportSettingsStep.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui.experts.importToCvs; import com.intellij.cvsSupport2.config.ImportConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportTree.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportTree.java index 7bf09e7922..41b05c523e 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportTree.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportTree.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui.experts.importToCvs; import com.intellij.CvsBundle; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportWizard.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportWizard.java index 006f3772b4..8444aea34e 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportWizard.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportWizard.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui.experts.importToCvs; import com.intellij.cvsSupport2.config.ImportConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/SelectImportLocationStep.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/SelectImportLocationStep.java index 1576200868..59c1b812a6 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/SelectImportLocationStep.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/SelectImportLocationStep.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.ui.experts.importToCvs; import com.intellij.cvsSupport2.ui.experts.CvsWizard; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/updateinfo/UpdatedFilesProcessor.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/updateinfo/UpdatedFilesProcessor.java index ffd61c77f8..42030d647d 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/updateinfo/UpdatedFilesProcessor.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/updateinfo/UpdatedFilesProcessor.java @@ -1,33 +1,17 @@ /* - * Copyright (c) 2004 JetBrains s.r.o. All Rights Reserved. + * Copyright 2000-2009 JetBrains s.r.o. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: + * 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 * - * -Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * -Redistribution in binary form must reproduct the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the distribution. - * - * Neither the name of JetBrains or IntelliJ IDEA - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * This software is provided "AS IS," without a warranty of any kind. ALL - * EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING - * ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE - * OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. JETBRAINS AND ITS LICENSORS SHALL NOT - * BE LIABLE FOR ANY DAMAGES OR LIABILITIES SUFFERED BY LICENSEE AS A RESULT - * OF OR RELATING TO USE, MODIFICATION OR DISTRIBUTION OF THE SOFTWARE OR ITS - * DERIVATIVES. IN NO EVENT WILL JETBRAINS OR ITS LICENSORS BE LIABLE FOR ANY LOST - * REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, - * INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY - * OF LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN - * IF JETBRAINS HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + * 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.cvsSupport2.updateinfo; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsFileUtil.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsFileUtil.java index c3b41c75f6..098b6521a0 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsFileUtil.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsFileUtil.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.util; import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsVfsUtil.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsVfsUtil.java index 4e106801be..95cec40735 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsVfsUtil.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsVfsUtil.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.util; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsModule.java b/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsModule.java index c42af03bfb..530d7611d4 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsModule.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsModule.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsRepository.java b/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsRepository.java index d491042073..c250bd6dc1 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsRepository.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsRepository.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsResult.java b/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsResult.java index 659401eae7..a20a99e098 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsResult.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsServices.java b/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsServices.java index be46614742..29fd7a5962 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsServices.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/openapi/cvsIntegration/CvsServices.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/cvs/javacvs-src/com/intellij/cvsSupport2/cvsoperations/cvsLog/RlogCommand.java b/plugins/cvs/javacvs-src/com/intellij/cvsSupport2/cvsoperations/cvsLog/RlogCommand.java index 781358f466..7d05e6a335 100644 --- a/plugins/cvs/javacvs-src/com/intellij/cvsSupport2/cvsoperations/cvsLog/RlogCommand.java +++ b/plugins/cvs/javacvs-src/com/intellij/cvsSupport2/cvsoperations/cvsLog/RlogCommand.java @@ -1,3 +1,18 @@ +/* + * 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.cvsSupport2.cvsoperations.cvsLog; import org.jetbrains.annotations.Nullable; diff --git a/plugins/devkit/resources/com/intellij/util/xml/PluginPsiClassConverter.java b/plugins/devkit/resources/com/intellij/util/xml/PluginPsiClassConverter.java index b0dbb76c91..9fabb3aeff 100644 --- a/plugins/devkit/resources/com/intellij/util/xml/PluginPsiClassConverter.java +++ b/plugins/devkit/resources/com/intellij/util/xml/PluginPsiClassConverter.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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.util.xml; diff --git a/plugins/devkit/src/DevKitBundle.java b/plugins/devkit/src/DevKitBundle.java index 23d58c92a4..d507273905 100644 --- a/plugins/devkit/src/DevKitBundle.java +++ b/plugins/devkit/src/DevKitBundle.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.devkit; import com.intellij.CommonBundle; diff --git a/plugins/devkit/src/DevKitFileTemplatesFactory.java b/plugins/devkit/src/DevKitFileTemplatesFactory.java index 384344bce5..0c2543b4a0 100644 --- a/plugins/devkit/src/DevKitFileTemplatesFactory.java +++ b/plugins/devkit/src/DevKitFileTemplatesFactory.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 org.jetbrains.idea.devkit; diff --git a/plugins/devkit/src/DevKitIconProvider.java b/plugins/devkit/src/DevKitIconProvider.java index 2f4bfab081..5beeed609c 100644 --- a/plugins/devkit/src/DevKitIconProvider.java +++ b/plugins/devkit/src/DevKitIconProvider.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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 org.jetbrains.idea.devkit; diff --git a/plugins/devkit/src/DevKitInspectionToolProvider.java b/plugins/devkit/src/DevKitInspectionToolProvider.java index dc5804fe11..911254af1f 100644 --- a/plugins/devkit/src/DevKitInspectionToolProvider.java +++ b/plugins/devkit/src/DevKitInspectionToolProvider.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 org.jetbrains.idea.devkit; diff --git a/plugins/devkit/src/actions/GenerateClassAndPatchPluginXmlActionBase.java b/plugins/devkit/src/actions/GenerateClassAndPatchPluginXmlActionBase.java index c9e2c7794e..073b2f576d 100644 --- a/plugins/devkit/src/actions/GenerateClassAndPatchPluginXmlActionBase.java +++ b/plugins/devkit/src/actions/GenerateClassAndPatchPluginXmlActionBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/actions/GenerateComponentExternalizationAction.java b/plugins/devkit/src/actions/GenerateComponentExternalizationAction.java index 3606d0d3bb..9c533b9ab9 100644 --- a/plugins/devkit/src/actions/GenerateComponentExternalizationAction.java +++ b/plugins/devkit/src/actions/GenerateComponentExternalizationAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/actions/GeneratePluginClassAction.java b/plugins/devkit/src/actions/GeneratePluginClassAction.java index 31728773cb..24e066ee50 100644 --- a/plugins/devkit/src/actions/GeneratePluginClassAction.java +++ b/plugins/devkit/src/actions/GeneratePluginClassAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/actions/NewActionAction.java b/plugins/devkit/src/actions/NewActionAction.java index 6c12f1648e..fe54bbde6f 100644 --- a/plugins/devkit/src/actions/NewActionAction.java +++ b/plugins/devkit/src/actions/NewActionAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/actions/NewActionDialog.java b/plugins/devkit/src/actions/NewActionDialog.java index 23d11470d7..8854296c59 100644 --- a/plugins/devkit/src/actions/NewActionDialog.java +++ b/plugins/devkit/src/actions/NewActionDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/actions/NewApplicationComponentAction.java b/plugins/devkit/src/actions/NewApplicationComponentAction.java index 038f1a0c46..8cc6988c3d 100644 --- a/plugins/devkit/src/actions/NewApplicationComponentAction.java +++ b/plugins/devkit/src/actions/NewApplicationComponentAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/actions/NewModuleComponentAction.java b/plugins/devkit/src/actions/NewModuleComponentAction.java index 0d66ab7ed9..7a999c39e3 100644 --- a/plugins/devkit/src/actions/NewModuleComponentAction.java +++ b/plugins/devkit/src/actions/NewModuleComponentAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/actions/NewProjectComponentAction.java b/plugins/devkit/src/actions/NewProjectComponentAction.java index 65f1ea1351..d97b4fc554 100644 --- a/plugins/devkit/src/actions/NewProjectComponentAction.java +++ b/plugins/devkit/src/actions/NewProjectComponentAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/build/PluginBuildConfiguration.java b/plugins/devkit/src/build/PluginBuildConfiguration.java index 12b0c9c360..8cac38d0dd 100644 --- a/plugins/devkit/src/build/PluginBuildConfiguration.java +++ b/plugins/devkit/src/build/PluginBuildConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/build/PluginBuildParticipant.java b/plugins/devkit/src/build/PluginBuildParticipant.java index ba570457b6..df2f042f0b 100644 --- a/plugins/devkit/src/build/PluginBuildParticipant.java +++ b/plugins/devkit/src/build/PluginBuildParticipant.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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 org.jetbrains.idea.devkit.build; diff --git a/plugins/devkit/src/build/PluginBuildParticipantProvider.java b/plugins/devkit/src/build/PluginBuildParticipantProvider.java index 555429c2a8..28f94e728c 100644 --- a/plugins/devkit/src/build/PluginBuildParticipantProvider.java +++ b/plugins/devkit/src/build/PluginBuildParticipantProvider.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * 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 org.jetbrains.idea.devkit.build; diff --git a/plugins/devkit/src/build/PluginBuildUtil.java b/plugins/devkit/src/build/PluginBuildUtil.java index a75a6f76e3..8a72589196 100644 --- a/plugins/devkit/src/build/PluginBuildUtil.java +++ b/plugins/devkit/src/build/PluginBuildUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/build/PluginModuleBuildConfEditor.java b/plugins/devkit/src/build/PluginModuleBuildConfEditor.java index b1fc864618..5cb17c2df6 100644 --- a/plugins/devkit/src/build/PluginModuleBuildConfEditor.java +++ b/plugins/devkit/src/build/PluginModuleBuildConfEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/build/PrepareAllToDeployAction.java b/plugins/devkit/src/build/PrepareAllToDeployAction.java index 0d9361e997..b9cf49fa93 100644 --- a/plugins/devkit/src/build/PrepareAllToDeployAction.java +++ b/plugins/devkit/src/build/PrepareAllToDeployAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/build/PrepareToDeployAction.java b/plugins/devkit/src/build/PrepareToDeployAction.java index 42fea4f139..c141f3723d 100644 --- a/plugins/devkit/src/build/PrepareToDeployAction.java +++ b/plugins/devkit/src/build/PrepareToDeployAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/build/ant/BuildJarTarget.java b/plugins/devkit/src/build/ant/BuildJarTarget.java index 27f3d9c959..8c3083e569 100644 --- a/plugins/devkit/src/build/ant/BuildJarTarget.java +++ b/plugins/devkit/src/build/ant/BuildJarTarget.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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. */ /* diff --git a/plugins/devkit/src/build/ant/ChunkBuildPluginExtension.java b/plugins/devkit/src/build/ant/ChunkBuildPluginExtension.java index 197430c7d4..2e43d8d52d 100644 --- a/plugins/devkit/src/build/ant/ChunkBuildPluginExtension.java +++ b/plugins/devkit/src/build/ant/ChunkBuildPluginExtension.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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. */ /* diff --git a/plugins/devkit/src/build/ant/PluginBuildProperties.java b/plugins/devkit/src/build/ant/PluginBuildProperties.java index 7aed6394bc..e7b1aaedd5 100644 --- a/plugins/devkit/src/build/ant/PluginBuildProperties.java +++ b/plugins/devkit/src/build/ant/PluginBuildProperties.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2007 JetBrains s.r.o. All Rights Reserved. + * 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 org.jetbrains.idea.devkit.build.ant; diff --git a/plugins/devkit/src/dom/Action.java b/plugins/devkit/src/dom/Action.java index eb35d085f7..18f6ab68ac 100644 --- a/plugins/devkit/src/dom/Action.java +++ b/plugins/devkit/src/dom/Action.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/util/ActionData.java b/plugins/devkit/src/dom/Actions.java similarity index 57% copy from plugins/devkit/src/util/ActionData.java copy to plugins/devkit/src/dom/Actions.java index 04c436af9c..4e06ec6da8 100644 --- a/plugins/devkit/src/util/ActionData.java +++ b/plugins/devkit/src/dom/Actions.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. @@ -13,34 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.idea.devkit.util; -import org.jetbrains.annotations.Nullable; +// Generated on Wed Nov 07 17:26:02 MSK 2007 +// DTD/Schema : plugin.dtd + +package org.jetbrains.idea.devkit.dom; + +import com.intellij.util.xml.DomElement; import org.jetbrains.annotations.NotNull; -/** - * @author swr - */ -public interface ActionData { - @NotNull - String getActionId(); +import java.util.List; - @NotNull - String getActionText(); +public interface Actions extends DomElement { - String getActionDescription(); + @NotNull + List getActions(); - @Nullable - String getSelectedGroupId(); + Action addAction(); - @Nullable - String getSelectedActionId(); - String getSelectedAnchor(); + @NotNull + List getGroups(); - @Nullable - String getFirstKeyStroke(); + Group addGroup(); - @Nullable - String getSecondKeyStroke(); + @NotNull + List getReferences(); } diff --git a/plugins/devkit/src/dom/AddToGroup.java b/plugins/devkit/src/dom/AddToGroup.java index fa33f74355..1472e58ed5 100644 --- a/plugins/devkit/src/dom/AddToGroup.java +++ b/plugins/devkit/src/dom/AddToGroup.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/dom/ApplicationComponents.java b/plugins/devkit/src/dom/ApplicationComponents.java index 2d0bb4d7c6..b6a29d45b9 100644 --- a/plugins/devkit/src/dom/ApplicationComponents.java +++ b/plugins/devkit/src/dom/ApplicationComponents.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/dom/Component.java b/plugins/devkit/src/dom/Component.java index 896eec3ae8..5ee37ca70c 100644 --- a/plugins/devkit/src/dom/Component.java +++ b/plugins/devkit/src/dom/Component.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/util/ActionData.java b/plugins/devkit/src/dom/Dependency.java similarity index 51% copy from plugins/devkit/src/util/ActionData.java copy to plugins/devkit/src/dom/Dependency.java index 04c436af9c..b2375c8da9 100644 --- a/plugins/devkit/src/util/ActionData.java +++ b/plugins/devkit/src/dom/Dependency.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. @@ -13,34 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.idea.devkit.util; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.NotNull; - -/** - * @author swr - */ -public interface ActionData { - @NotNull - String getActionId(); - - @NotNull - String getActionText(); - - String getActionDescription(); +// Generated on Wed Nov 07 17:26:02 MSK 2007 +// DTD/Schema : plugin.dtd - @Nullable - String getSelectedGroupId(); +package org.jetbrains.idea.devkit.dom; - @Nullable - String getSelectedActionId(); - - String getSelectedAnchor(); - - @Nullable - String getFirstKeyStroke(); - - @Nullable - String getSecondKeyStroke(); +import com.intellij.util.xml.Convert; +import com.intellij.util.xml.GenericAttributeValue; +import com.intellij.util.xml.GenericDomValue; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.idea.devkit.dom.impl.IdeaPluginConverter; + +@Convert(IdeaPluginConverter.class) +public interface Dependency extends GenericDomValue { + @NotNull + GenericAttributeValue getOptional(); + @NotNull + GenericAttributeValue getConfigFile(); } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/devkit/src/dom/Extension.java similarity index 60% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/devkit/src/dom/Extension.java index f044a3bc10..80086c227b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/devkit/src/dom/Extension.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package org.jetbrains.idea.devkit.dom; -import com.intellij.psi.PsiElement; +import com.intellij.util.xml.DomElement; +import com.intellij.util.xml.GenericAttributeValue; +import com.intellij.util.xml.NameValue; /** - * @author dyoma + * @author mike */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface Extension extends DomElement { + + @NameValue + GenericAttributeValue getId(); + + GenericAttributeValue getOrder(); + } diff --git a/plugins/devkit/src/dom/ExtensionPoint.java b/plugins/devkit/src/dom/ExtensionPoint.java index feb07546e5..47e1f59ab8 100644 --- a/plugins/devkit/src/dom/ExtensionPoint.java +++ b/plugins/devkit/src/dom/ExtensionPoint.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.devkit.dom; import com.intellij.psi.PsiClass; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/devkit/src/dom/ExtensionPoints.java similarity index 57% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/devkit/src/dom/ExtensionPoints.java index f044a3bc10..cfc51e01fe 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/devkit/src/dom/ExtensionPoints.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package org.jetbrains.idea.devkit.dom; -import com.intellij.psi.PsiElement; +import com.intellij.util.xml.DomElement; +import com.intellij.util.xml.SubTagList; +import org.jetbrains.annotations.NotNull; + +import java.util.List; /** - * @author dyoma + * @author mike */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public interface ExtensionPoints extends DomElement { + @NotNull + @SubTagList("extensionPoint") + List getExtensionPoints(); + ExtensionPoint addExtensionPoint(); } diff --git a/plugins/devkit/src/dom/Extensions.java b/plugins/devkit/src/dom/Extensions.java index eda21ef237..e235fd9031 100644 --- a/plugins/devkit/src/dom/Extensions.java +++ b/plugins/devkit/src/dom/Extensions.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/dom/Group.java b/plugins/devkit/src/dom/Group.java index a4aa235066..cadec21dc3 100644 --- a/plugins/devkit/src/dom/Group.java +++ b/plugins/devkit/src/dom/Group.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/dom/Helpset.java b/plugins/devkit/src/dom/Helpset.java index 77b56879f7..24005f1626 100644 --- a/plugins/devkit/src/dom/Helpset.java +++ b/plugins/devkit/src/dom/Helpset.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/dom/IdeaPlugin.java b/plugins/devkit/src/dom/IdeaPlugin.java index b2e5f8125d..8d1d193daa 100644 --- a/plugins/devkit/src/dom/IdeaPlugin.java +++ b/plugins/devkit/src/dom/IdeaPlugin.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/util/ActionData.java b/plugins/devkit/src/dom/IdeaVersion.java similarity index 51% copy from plugins/devkit/src/util/ActionData.java copy to plugins/devkit/src/dom/IdeaVersion.java index 04c436af9c..88ca04a03c 100644 --- a/plugins/devkit/src/util/ActionData.java +++ b/plugins/devkit/src/dom/IdeaVersion.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. @@ -13,34 +13,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.idea.devkit.util; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.annotations.NotNull; - -/** - * @author swr - */ -public interface ActionData { - @NotNull - String getActionId(); +// Generated on Wed Nov 07 17:26:02 MSK 2007 +// DTD/Schema : plugin.dtd - @NotNull - String getActionText(); +package org.jetbrains.idea.devkit.dom; - String getActionDescription(); +import com.intellij.util.xml.DomElement; +import com.intellij.util.xml.GenericAttributeValue; +import com.intellij.util.xml.Required; +import org.jetbrains.annotations.NotNull; - @Nullable - String getSelectedGroupId(); +public interface IdeaVersion extends DomElement { + @NotNull + GenericAttributeValue getMax(); - @Nullable - String getSelectedActionId(); + @NotNull + @Required + GenericAttributeValue getSinceBuild(); - String getSelectedAnchor(); + @NotNull + GenericAttributeValue getUntilBuild(); - @Nullable - String getFirstKeyStroke(); - @Nullable - String getSecondKeyStroke(); + @NotNull + GenericAttributeValue getMin(); } diff --git a/plugins/devkit/src/dom/KeyboardShortcut.java b/plugins/devkit/src/dom/KeyboardShortcut.java index 4e64654f77..4034a113ce 100644 --- a/plugins/devkit/src/dom/KeyboardShortcut.java +++ b/plugins/devkit/src/dom/KeyboardShortcut.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/dom/ModuleComponents.java b/plugins/devkit/src/dom/ModuleComponents.java index fac01e6a33..62f898c7b7 100644 --- a/plugins/devkit/src/dom/ModuleComponents.java +++ b/plugins/devkit/src/dom/ModuleComponents.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/dom/MouseShortcut.java b/plugins/devkit/src/dom/MouseShortcut.java index cb1f3b175a..fc0544ac6f 100644 --- a/plugins/devkit/src/dom/MouseShortcut.java +++ b/plugins/devkit/src/dom/MouseShortcut.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/dom/Option.java b/plugins/devkit/src/dom/Option.java index 6b2d389a68..d7ca965fbb 100644 --- a/plugins/devkit/src/dom/Option.java +++ b/plugins/devkit/src/dom/Option.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/util/ActionData.java b/plugins/devkit/src/dom/ProjectComponents.java similarity index 57% copy from plugins/devkit/src/util/ActionData.java copy to plugins/devkit/src/dom/ProjectComponents.java index 04c436af9c..d87425fd8a 100644 --- a/plugins/devkit/src/util/ActionData.java +++ b/plugins/devkit/src/dom/ProjectComponents.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. @@ -13,34 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.idea.devkit.util; -import org.jetbrains.annotations.Nullable; +// Generated on Wed Nov 07 17:26:02 MSK 2007 +// DTD/Schema : plugin.dtd + +package org.jetbrains.idea.devkit.dom; + +import com.intellij.util.xml.DomElement; import org.jetbrains.annotations.NotNull; +import java.util.List; + /** - * @author swr + * plugin.dtd:project-components interface. */ -public interface ActionData { - @NotNull - String getActionId(); +public interface ProjectComponents extends DomElement { @NotNull - String getActionText(); - - String getActionDescription(); - - @Nullable - String getSelectedGroupId(); - - @Nullable - String getSelectedActionId(); - - String getSelectedAnchor(); - - @Nullable - String getFirstKeyStroke(); + List getComponents(); - @Nullable - String getSecondKeyStroke(); + Component.Project addComponent(); } diff --git a/plugins/devkit/src/dom/Reference.java b/plugins/devkit/src/dom/Reference.java index 8194a781a8..57f1beac67 100644 --- a/plugins/devkit/src/dom/Reference.java +++ b/plugins/devkit/src/dom/Reference.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/dom/Shortcut.java b/plugins/devkit/src/dom/Shortcut.java index 7635f63d08..0b4fb7d6da 100644 --- a/plugins/devkit/src/dom/Shortcut.java +++ b/plugins/devkit/src/dom/Shortcut.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/dom/Vendor.java b/plugins/devkit/src/dom/Vendor.java index 184e0b5d23..b0eb0251d5 100644 --- a/plugins/devkit/src/dom/Vendor.java +++ b/plugins/devkit/src/dom/Vendor.java @@ -1,3 +1,19 @@ +/* + * 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. + */ + // Generated on Wed Nov 07 17:26:02 MSK 2007 // DTD/Schema : plugin.dtd diff --git a/plugins/devkit/src/dom/impl/ExtensionDomExtender.java b/plugins/devkit/src/dom/impl/ExtensionDomExtender.java index 9c2c8cb71b..926d215699 100644 --- a/plugins/devkit/src/dom/impl/ExtensionDomExtender.java +++ b/plugins/devkit/src/dom/impl/ExtensionDomExtender.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.devkit.dom.impl; import com.intellij.ide.plugins.PluginManager; diff --git a/plugins/devkit/src/dom/impl/ExtensionNsConverter.java b/plugins/devkit/src/dom/impl/ExtensionNsConverter.java index 60769e8ea9..18e7a3200f 100644 --- a/plugins/devkit/src/dom/impl/ExtensionNsConverter.java +++ b/plugins/devkit/src/dom/impl/ExtensionNsConverter.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.devkit.dom.impl; import com.intellij.openapi.util.Condition; diff --git a/plugins/devkit/src/dom/impl/IdeaPluginConverter.java b/plugins/devkit/src/dom/impl/IdeaPluginConverter.java index 1db8a9b748..b875522040 100644 --- a/plugins/devkit/src/dom/impl/IdeaPluginConverter.java +++ b/plugins/devkit/src/dom/impl/IdeaPluginConverter.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.devkit.dom.impl; import com.intellij.openapi.fileTypes.FileTypes; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/devkit/src/dom/impl/IdeaPluginImpl.java similarity index 56% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/devkit/src/dom/impl/IdeaPluginImpl.java index e1da04a96a..a97c90eaf1 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/devkit/src/dom/impl/IdeaPluginImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package org.jetbrains.idea.devkit.dom.impl; -package com.intellij.lang.ant.config; +import org.jetbrains.idea.devkit.dom.IdeaPlugin; -import com.intellij.openapi.vfs.VirtualFile; - -public class AntNoFileException extends Exception { - private final VirtualFile myFile; - - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; - } - - public VirtualFile getFile() { - return myFile; +/* +* Created by IntelliJ IDEA. +* User: sweinreuter +* Date: 06.12.2007 +*/ +public abstract class IdeaPluginImpl implements IdeaPlugin { + public String getPluginId() { + final String id = getId().getStringValue(); + if (id != null) { + return id; + } + return getName().getStringValue(); } } diff --git a/plugins/devkit/src/dom/impl/PluginXmlDomFileDescription.java b/plugins/devkit/src/dom/impl/PluginXmlDomFileDescription.java index de4611e84c..de30052e95 100644 --- a/plugins/devkit/src/dom/impl/PluginXmlDomFileDescription.java +++ b/plugins/devkit/src/dom/impl/PluginXmlDomFileDescription.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.devkit.dom.impl; import com.intellij.openapi.module.Module; diff --git a/plugins/devkit/src/inspections/ComponentNotRegisteredInspection.java b/plugins/devkit/src/inspections/ComponentNotRegisteredInspection.java index 512932bab2..3ab0810098 100644 --- a/plugins/devkit/src/inspections/ComponentNotRegisteredInspection.java +++ b/plugins/devkit/src/inspections/ComponentNotRegisteredInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/inspections/DescriptionNotFoundInspection.java b/plugins/devkit/src/inspections/DescriptionNotFoundInspection.java index c6a28d5216..cdefd28471 100644 --- a/plugins/devkit/src/inspections/DescriptionNotFoundInspection.java +++ b/plugins/devkit/src/inspections/DescriptionNotFoundInspection.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 org.jetbrains.idea.devkit.inspections; diff --git a/plugins/devkit/src/inspections/DevKitInspectionBase.java b/plugins/devkit/src/inspections/DevKitInspectionBase.java index ae87080a17..cc2964147a 100644 --- a/plugins/devkit/src/inspections/DevKitInspectionBase.java +++ b/plugins/devkit/src/inspections/DevKitInspectionBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/inspections/PluginXmlDomInspection.java b/plugins/devkit/src/inspections/PluginXmlDomInspection.java index 198e5440b2..6efe89a615 100644 --- a/plugins/devkit/src/inspections/PluginXmlDomInspection.java +++ b/plugins/devkit/src/inspections/PluginXmlDomInspection.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.devkit.inspections; import com.intellij.util.xml.DomElement; diff --git a/plugins/devkit/src/inspections/RegistrationProblemsInspection.java b/plugins/devkit/src/inspections/RegistrationProblemsInspection.java index 1b25d2de64..07b93eb427 100644 --- a/plugins/devkit/src/inspections/RegistrationProblemsInspection.java +++ b/plugins/devkit/src/inspections/RegistrationProblemsInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/inspections/quickfix/AbstractRegisterFix.java b/plugins/devkit/src/inspections/quickfix/AbstractRegisterFix.java index 55948a0f7c..ae1ff4aa02 100644 --- a/plugins/devkit/src/inspections/quickfix/AbstractRegisterFix.java +++ b/plugins/devkit/src/inspections/quickfix/AbstractRegisterFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/inspections/quickfix/BaseFix.java b/plugins/devkit/src/inspections/quickfix/BaseFix.java index 5ea9f4365e..027c11766e 100644 --- a/plugins/devkit/src/inspections/quickfix/BaseFix.java +++ b/plugins/devkit/src/inspections/quickfix/BaseFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2006 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/inspections/quickfix/CreateConstructorFix.java b/plugins/devkit/src/inspections/quickfix/CreateConstructorFix.java index cf365c53c3..cce73cd8d5 100644 --- a/plugins/devkit/src/inspections/quickfix/CreateConstructorFix.java +++ b/plugins/devkit/src/inspections/quickfix/CreateConstructorFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2006 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java b/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java index 6166c8c90d..4c447de39f 100644 --- a/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java +++ b/plugins/devkit/src/inspections/quickfix/CreateHtmlDescriptionFix.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 org.jetbrains.idea.devkit.inspections.quickfix; diff --git a/plugins/devkit/src/inspections/quickfix/ImplementOrExtendFix.java b/plugins/devkit/src/inspections/quickfix/ImplementOrExtendFix.java index 257cfa561a..3169319381 100644 --- a/plugins/devkit/src/inspections/quickfix/ImplementOrExtendFix.java +++ b/plugins/devkit/src/inspections/quickfix/ImplementOrExtendFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2006 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/inspections/quickfix/MakePublicFix.java b/plugins/devkit/src/inspections/quickfix/MakePublicFix.java index de8aa052e5..3d762aca1c 100644 --- a/plugins/devkit/src/inspections/quickfix/MakePublicFix.java +++ b/plugins/devkit/src/inspections/quickfix/MakePublicFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/inspections/quickfix/RegisterActionFix.java b/plugins/devkit/src/inspections/quickfix/RegisterActionFix.java index d287c48697..061deef3d7 100644 --- a/plugins/devkit/src/inspections/quickfix/RegisterActionFix.java +++ b/plugins/devkit/src/inspections/quickfix/RegisterActionFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/inspections/quickfix/RegisterComponentFix.java b/plugins/devkit/src/inspections/quickfix/RegisterComponentFix.java index 7884242540..0c3d0fd645 100644 --- a/plugins/devkit/src/inspections/quickfix/RegisterComponentFix.java +++ b/plugins/devkit/src/inspections/quickfix/RegisterComponentFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/module/PluginDescriptorConstants.java b/plugins/devkit/src/module/PluginDescriptorConstants.java index 34ae689850..3949a859d9 100644 --- a/plugins/devkit/src/module/PluginDescriptorConstants.java +++ b/plugins/devkit/src/module/PluginDescriptorConstants.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/module/PluginModuleBuilder.java b/plugins/devkit/src/module/PluginModuleBuilder.java index c19df6a985..2aab54b73c 100644 --- a/plugins/devkit/src/module/PluginModuleBuilder.java +++ b/plugins/devkit/src/module/PluginModuleBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/module/PluginModuleEditorsProvider.java b/plugins/devkit/src/module/PluginModuleEditorsProvider.java index f50577f1f8..c2b5d0a5cf 100644 --- a/plugins/devkit/src/module/PluginModuleEditorsProvider.java +++ b/plugins/devkit/src/module/PluginModuleEditorsProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/module/PluginModuleType.java b/plugins/devkit/src/module/PluginModuleType.java index 885b66f498..315295f71b 100644 --- a/plugins/devkit/src/module/PluginModuleType.java +++ b/plugins/devkit/src/module/PluginModuleType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/projectRoots/IdeaJdk.java b/plugins/devkit/src/projectRoots/IdeaJdk.java index 9e40859e18..589af3a323 100644 --- a/plugins/devkit/src/projectRoots/IdeaJdk.java +++ b/plugins/devkit/src/projectRoots/IdeaJdk.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/projectRoots/IdeaJdkConfigurable.java b/plugins/devkit/src/projectRoots/IdeaJdkConfigurable.java index b49a45d1aa..9ec3590d58 100644 --- a/plugins/devkit/src/projectRoots/IdeaJdkConfigurable.java +++ b/plugins/devkit/src/projectRoots/IdeaJdkConfigurable.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/projectRoots/Sandbox.java b/plugins/devkit/src/projectRoots/Sandbox.java index 3ffc677d59..845bbda7cc 100644 --- a/plugins/devkit/src/projectRoots/Sandbox.java +++ b/plugins/devkit/src/projectRoots/Sandbox.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/run/IdeaLicenseHelper.java b/plugins/devkit/src/run/IdeaLicenseHelper.java index 0593f7bda3..84dc5a02f6 100644 --- a/plugins/devkit/src/run/IdeaLicenseHelper.java +++ b/plugins/devkit/src/run/IdeaLicenseHelper.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/run/JUnitDevKitPatcher.java b/plugins/devkit/src/run/JUnitDevKitPatcher.java index 0ae7fe5af2..cc274f0311 100644 --- a/plugins/devkit/src/run/JUnitDevKitPatcher.java +++ b/plugins/devkit/src/run/JUnitDevKitPatcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/run/PluginConfigurationType.java b/plugins/devkit/src/run/PluginConfigurationType.java index 3473ece662..f1841255e7 100644 --- a/plugins/devkit/src/run/PluginConfigurationType.java +++ b/plugins/devkit/src/run/PluginConfigurationType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/run/PluginRunConfiguration.java b/plugins/devkit/src/run/PluginRunConfiguration.java index a7e42ca065..34b0ab3e92 100644 --- a/plugins/devkit/src/run/PluginRunConfiguration.java +++ b/plugins/devkit/src/run/PluginRunConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/run/PluginRunConfigurationEditor.java b/plugins/devkit/src/run/PluginRunConfigurationEditor.java index 9e7ac7234f..0473e7edb4 100644 --- a/plugins/devkit/src/run/PluginRunConfigurationEditor.java +++ b/plugins/devkit/src/run/PluginRunConfigurationEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/util/ActionData.java b/plugins/devkit/src/util/ActionData.java index 04c436af9c..445fc936be 100644 --- a/plugins/devkit/src/util/ActionData.java +++ b/plugins/devkit/src/util/ActionData.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/util/ActionType.java b/plugins/devkit/src/util/ActionType.java index f1e77ebfb0..06be2feaf2 100644 --- a/plugins/devkit/src/util/ActionType.java +++ b/plugins/devkit/src/util/ActionType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/util/ChooseModulesDialog.java b/plugins/devkit/src/util/ChooseModulesDialog.java index 53d4713492..da2ace2b29 100644 --- a/plugins/devkit/src/util/ChooseModulesDialog.java +++ b/plugins/devkit/src/util/ChooseModulesDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/util/ComponentType.java b/plugins/devkit/src/util/ComponentType.java index c250547eee..a913756ca2 100644 --- a/plugins/devkit/src/util/ComponentType.java +++ b/plugins/devkit/src/util/ComponentType.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/util/DescriptorUtil.java b/plugins/devkit/src/util/DescriptorUtil.java index 2a89349701..4fca895108 100644 --- a/plugins/devkit/src/util/DescriptorUtil.java +++ b/plugins/devkit/src/util/DescriptorUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. diff --git a/plugins/devkit/src/util/PsiUtil.java b/plugins/devkit/src/util/PsiUtil.java index 908fa0195a..3bd7e71d62 100644 --- a/plugins/devkit/src/util/PsiUtil.java +++ b/plugins/devkit/src/util/PsiUtil.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 org.jetbrains.idea.devkit.util; diff --git a/plugins/devkit/testSources/build/GenerateAntTest.java b/plugins/devkit/testSources/build/GenerateAntTest.java index a06101c0f4..035e2fc368 100644 --- a/plugins/devkit/testSources/build/GenerateAntTest.java +++ b/plugins/devkit/testSources/build/GenerateAntTest.java @@ -1,5 +1,17 @@ /* - * Copyright (c) 2000-2006 JetBrains s.r.o. All Rights Reserved. + * 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. */ /* diff --git a/plugins/devkit/testSources/codeInsight/CreateClassFixTest.java b/plugins/devkit/testSources/codeInsight/CreateClassFixTest.java index f9529c9774..ff1e102bd0 100644 --- a/plugins/devkit/testSources/codeInsight/CreateClassFixTest.java +++ b/plugins/devkit/testSources/codeInsight/CreateClassFixTest.java @@ -1,4 +1,20 @@ /* + * 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. + */ + +/* * User: anna * Date: 14-Jun-2007 */ diff --git a/plugins/devkit/testSources/codeInsight/PluginXmlFunctionalTest.java b/plugins/devkit/testSources/codeInsight/PluginXmlFunctionalTest.java index 5ce5e6cb1f..9d5d3d6738 100644 --- a/plugins/devkit/testSources/codeInsight/PluginXmlFunctionalTest.java +++ b/plugins/devkit/testSources/codeInsight/PluginXmlFunctionalTest.java @@ -1,6 +1,17 @@ /* - * Copyright (c) 2000-2005 by JetBrains s.r.o. All Rights Reserved. - * Use is subject to license terms. + * 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 org.jetbrains.idea.devkit.codeInsight; diff --git a/plugins/eclipse/src/org/jdom/output/EclipseJDOMUtil.java b/plugins/eclipse/src/org/jdom/output/EclipseJDOMUtil.java index 6478a6c4e0..a09781b78d 100644 --- a/plugins/eclipse/src/org/jdom/output/EclipseJDOMUtil.java +++ b/plugins/eclipse/src/org/jdom/output/EclipseJDOMUtil.java @@ -1,3 +1,18 @@ +/* + * 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 org.jdom.output; import com.intellij.openapi.project.Project; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/EclipseBundle.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/EclipseBundle.java index ad1753bc03..d3c9174d2f 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/EclipseBundle.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/EclipseBundle.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.eclipse; import com.intellij.CommonBundle; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/EclipseXml.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/EclipseXml.java index 0446e6d941..3812e85b3c 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/EclipseXml.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/EclipseXml.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.eclipse; import org.jetbrains.annotations.NonNls; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/IdeaXml.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/IdeaXml.java index 38a2e565bf..dd01d0d63c 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/IdeaXml.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/IdeaXml.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.eclipse; import org.jetbrains.annotations.NonNls; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/CachedXmlDocumentSet.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/CachedXmlDocumentSet.java index f6e19cde82..be8b72c4c4 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/CachedXmlDocumentSet.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/CachedXmlDocumentSet.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.eclipse.config; import com.intellij.openapi.application.ApplicationManager; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseClasspathStorageProvider.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseClasspathStorageProvider.java index 357d9e8293..ac569f7acc 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseClasspathStorageProvider.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseClasspathStorageProvider.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.eclipse.config; import com.intellij.openapi.module.Module; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java index e652c96930..9395a553b0 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileType.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.eclipse.config; import com.intellij.openapi.fileTypes.FileType; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileTypeFactory.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileTypeFactory.java index 3a986a61b8..77e64e6dc3 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileTypeFactory.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseFileTypeFactory.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.eclipse.config; import com.intellij.openapi.fileTypes.FileType; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java index de03721193..1a195a0e0b 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/config/EclipseModuleManager.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 org.jetbrains.idea.eclipse.config; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildListener.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/ConversionException.java similarity index 61% copy from plugins/ant/src/com/intellij/lang/ant/config/AntBuildListener.java copy to plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/ConversionException.java index 7fa229e2d1..7c5e1de2c8 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildListener.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/ConversionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,18 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package org.jetbrains.idea.eclipse.conversion; -package com.intellij.lang.ant.config; +import java.text.MessageFormat; -public interface AntBuildListener { +public class ConversionException extends Exception { + public ConversionException(String message) { + super(message); + } - int FINISHED_SUCCESSFULLY = 0; - int ABORTED = 1; - int FAILED_TO_RUN = 2; - - AntBuildListener NULL = new AntBuildListener() { - public void buildFinished(int state, int errorCount) { } - }; - - void buildFinished(int state, int errorCount); + public ConversionException(String message, Object... param) { + super(MessageFormat.format(message, param)); + } } diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/DotProjectFileHelper.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/DotProjectFileHelper.java index 44cf811c1f..006282815f 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/DotProjectFileHelper.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/DotProjectFileHelper.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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. */ /* diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathReader.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathReader.java index 1a2f51ff22..6e595fc96e 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathReader.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java index 41d8a9bff8..8d7ed74b65 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseClasspathWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseUserLibrariesHelper.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseUserLibrariesHelper.java index f6f1b0fd6e..2e180d0169 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseUserLibrariesHelper.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/conversion/EclipseUserLibrariesHelper.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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. */ /* diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/export/ExportEclipseProjectsAction.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/export/ExportEclipseProjectsAction.java index e0081b7189..297c863e9a 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/export/ExportEclipseProjectsAction.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/export/ExportEclipseProjectsAction.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.eclipse.export; import com.intellij.openapi.actionSystem.AnAction; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/export/ExportEclipseProjectsDialog.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/export/ExportEclipseProjectsDialog.java index bb46041190..8a858f230d 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/export/ExportEclipseProjectsDialog.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/export/ExportEclipseProjectsDialog.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.eclipse.export; import com.intellij.ide.util.ElementsChooser; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java index 9c5b400993..c4359c29c0 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseImportBuilder.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.eclipse.importWizard; import com.intellij.openapi.application.ApplicationManager; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectFinder.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectFinder.java index caae1af905..925204793f 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectFinder.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectFinder.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectImportProvider.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectImportProvider.java index a320e8eebb..7a47a6caac 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectImportProvider.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectImportProvider.java @@ -1,4 +1,20 @@ /* + * 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. + */ + +/* * User: anna * Date: 12-Jul-2007 */ diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectOpenProcessor.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectOpenProcessor.java index 4f0517d791..e80001cf7f 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectOpenProcessor.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectOpenProcessor.java @@ -1,4 +1,20 @@ /* + * 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. + */ + +/* * User: anna * Date: 12-Jul-2007 */ diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectWizardContext.java similarity index 66% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectWizardContext.java index f044a3bc10..4baf865125 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseProjectWizardContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package org.jetbrains.idea.eclipse.importWizard; -import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.Nullable; /** - * @author dyoma - */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); + * @author Vladislav.Kaznacheev +*/ +interface EclipseProjectWizardContext { + @Nullable + String getRootDirectory(); + + boolean setRootDirectory(String path); } diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseWorkspaceRootStep.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseWorkspaceRootStep.java index 20cd480ec3..5fd3df7449 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseWorkspaceRootStep.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/EclipseWorkspaceRootStep.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.eclipse.importWizard; import com.intellij.ide.util.PropertiesComponent; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/Options.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/Options.java index 35b2d94216..fab8295bbe 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/Options.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/Options.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/SelectEclipseImportedProjectsStep.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/SelectEclipseImportedProjectsStep.java index 982690e8ec..ef7bed3d21 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/SelectEclipseImportedProjectsStep.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/SelectEclipseImportedProjectsStep.java @@ -1,4 +1,20 @@ /* + * 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. + */ + +/* * User: anna * Date: 12-Jul-2007 */ diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/util/ErrorLog.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/util/ErrorLog.java index 23d6ccaf0a..3c7e7e336d 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/util/ErrorLog.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/util/ErrorLog.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.eclipse.util; import com.intellij.openapi.util.io.FileUtil; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/util/JDOMCompare.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/util/JDOMCompare.java index 3b7cc8f324..cc3b4cab2f 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/util/JDOMCompare.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/util/JDOMCompare.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.eclipse.util; import org.jdom.Attribute; diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/util/PathUtil.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/util/PathUtil.java index 0691f6b57a..97ddf74151 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/util/PathUtil.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/util/PathUtil.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.idea.eclipse.util; import com.intellij.openapi.util.io.FileUtil; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/eclipse/testData/iml/allProps/eclipse-externals/lib-3/copy-every/src/eclipseLib/SourceThree.java similarity index 66% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/eclipse/testData/iml/allProps/eclipse-externals/lib-3/copy-every/src/eclipseLib/SourceThree.java index f044a3bc10..836b2205ab 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/eclipse/testData/iml/allProps/eclipse-externals/lib-3/copy-every/src/eclipseLib/SourceThree.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package eclipseLib; /** - * @author dyoma + * Created in IntelliJ IDEA. + * By: Alexander.Chernikov + * When: 19.02.2009, 20:55:48 + * Русский текст. */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class SourceThree { + public static final String ELIB_CONST = "value 3"; + + public void elibMethod() { + } } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/eclipse/testData/iml/allProps/eclipse-vars/lib-7/copy-every/src/eclipseLib/SourceSeven.java similarity index 66% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/eclipse/testData/iml/allProps/eclipse-vars/lib-7/copy-every/src/eclipseLib/SourceSeven.java index f044a3bc10..440e48891a 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/eclipse/testData/iml/allProps/eclipse-vars/lib-7/copy-every/src/eclipseLib/SourceSeven.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package eclipseLib; /** - * @author dyoma + * Created in IntelliJ IDEA. + * By: Alexander.Chernikov + * When: 19.02.2009, 20:55:48 + * Русский текст. */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class SourceSeven { + public static final String ELIB_CONST = "value 7"; + + public void elibMethod() { + } } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/eclipse/testData/iml/allProps/eclipse-vars/lib-9/copy-every/src/eclipseLib/SourceNine.java similarity index 66% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/eclipse/testData/iml/allProps/eclipse-vars/lib-9/copy-every/src/eclipseLib/SourceNine.java index f044a3bc10..0006403cba 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/eclipse/testData/iml/allProps/eclipse-vars/lib-9/copy-every/src/eclipseLib/SourceNine.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package eclipseLib; /** - * @author dyoma + * Created in IntelliJ IDEA. + * By: Alexander.Chernikov + * When: 19.02.2009, 20:55:48 + * Русский текст. */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class SourceNine { + public static final String ELIB_CONST = "value 9"; + + public void elibMethod() { + } } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/all-props/lib-1/copy-every/src/eclipseLib/SourceOne.java similarity index 66% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/all-props/lib-1/copy-every/src/eclipseLib/SourceOne.java index f044a3bc10..4fe80727fd 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/all-props/lib-1/copy-every/src/eclipseLib/SourceOne.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package eclipseLib; /** - * @author dyoma + * Created in IntelliJ IDEA. + * By: Alexander.Chernikov + * When: 19.02.2009, 20:55:48 + * Русский текст. */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class SourceOne { + public static final String ELIB_CONST = "value 1"; + + public void elibMethod() { + } } diff --git a/plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/all-props/src/pkg/Resident.java b/plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/all-props/src/pkg/Resident.java index f6d8a9a3e8..6588d13dfd 100644 --- a/plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/all-props/src/pkg/Resident.java +++ b/plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/all-props/src/pkg/Resident.java @@ -1,3 +1,18 @@ +/* + * 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 pkg; import eclipseLib.SourceOne; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/ws-internals/lib-2/copy-every/src/eclipseLib/SourceTwo.java similarity index 66% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/ws-internals/lib-2/copy-every/src/eclipseLib/SourceTwo.java index f044a3bc10..c2e367dd95 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/eclipse/testData/iml/allProps/eclipse-ws-3.4.1-a/ws-internals/lib-2/copy-every/src/eclipseLib/SourceTwo.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package eclipseLib; /** - * @author dyoma + * Created in IntelliJ IDEA. + * By: Alexander.Chernikov + * When: 19.02.2009, 20:55:48 + * Русский текст. */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class SourceTwo { + public static final String ELIB_CONST = "value 2"; + + public void elibMethod() { + } } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/eclipse/testData/round/allProps/eclipse-externals/lib-3/copy-every/src/eclipseLib/SourceThree.java similarity index 66% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/eclipse/testData/round/allProps/eclipse-externals/lib-3/copy-every/src/eclipseLib/SourceThree.java index f044a3bc10..836b2205ab 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/eclipse/testData/round/allProps/eclipse-externals/lib-3/copy-every/src/eclipseLib/SourceThree.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package eclipseLib; /** - * @author dyoma + * Created in IntelliJ IDEA. + * By: Alexander.Chernikov + * When: 19.02.2009, 20:55:48 + * Русский текст. */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class SourceThree { + public static final String ELIB_CONST = "value 3"; + + public void elibMethod() { + } } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/eclipse/testData/round/allProps/eclipse-vars/lib-7/copy-every/src/eclipseLib/SourceSeven.java similarity index 66% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/eclipse/testData/round/allProps/eclipse-vars/lib-7/copy-every/src/eclipseLib/SourceSeven.java index f044a3bc10..440e48891a 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/eclipse/testData/round/allProps/eclipse-vars/lib-7/copy-every/src/eclipseLib/SourceSeven.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package eclipseLib; /** - * @author dyoma + * Created in IntelliJ IDEA. + * By: Alexander.Chernikov + * When: 19.02.2009, 20:55:48 + * Русский текст. */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class SourceSeven { + public static final String ELIB_CONST = "value 7"; + + public void elibMethod() { + } } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/eclipse/testData/round/allProps/eclipse-vars/lib-9/copy-every/src/eclipseLib/SourceNine.java similarity index 66% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/eclipse/testData/round/allProps/eclipse-vars/lib-9/copy-every/src/eclipseLib/SourceNine.java index f044a3bc10..0006403cba 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/eclipse/testData/round/allProps/eclipse-vars/lib-9/copy-every/src/eclipseLib/SourceNine.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package eclipseLib; /** - * @author dyoma + * Created in IntelliJ IDEA. + * By: Alexander.Chernikov + * When: 19.02.2009, 20:55:48 + * Русский текст. */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class SourceNine { + public static final String ELIB_CONST = "value 9"; + + public void elibMethod() { + } } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/all-props/lib-1/copy-every/src/eclipseLib/SourceOne.java similarity index 66% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/all-props/lib-1/copy-every/src/eclipseLib/SourceOne.java index f044a3bc10..4fe80727fd 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/all-props/lib-1/copy-every/src/eclipseLib/SourceOne.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package eclipseLib; /** - * @author dyoma + * Created in IntelliJ IDEA. + * By: Alexander.Chernikov + * When: 19.02.2009, 20:55:48 + * Русский текст. */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class SourceOne { + public static final String ELIB_CONST = "value 1"; + + public void elibMethod() { + } } diff --git a/plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/all-props/src/pkg/Resident.java b/plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/all-props/src/pkg/Resident.java index f6d8a9a3e8..6588d13dfd 100644 --- a/plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/all-props/src/pkg/Resident.java +++ b/plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/all-props/src/pkg/Resident.java @@ -1,3 +1,18 @@ +/* + * 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 pkg; import eclipseLib.SourceOne; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/ws-internals/lib-2/copy-every/src/eclipseLib/SourceTwo.java similarity index 66% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/ws-internals/lib-2/copy-every/src/eclipseLib/SourceTwo.java index f044a3bc10..c2e367dd95 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/eclipse/testData/round/allProps/eclipse-ws-3.4.1-a/ws-internals/lib-2/copy-every/src/eclipseLib/SourceTwo.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; - -import com.intellij.psi.PsiElement; +package eclipseLib; /** - * @author dyoma + * Created in IntelliJ IDEA. + * By: Alexander.Chernikov + * When: 19.02.2009, 20:55:48 + * Русский текст. */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class SourceTwo { + public static final String ELIB_CONST = "value 2"; + + public void elibMethod() { + } } diff --git a/plugins/eclipse/testData/round/plugin/test/src/plug_me_in_eclipse_3_4/Activator.java b/plugins/eclipse/testData/round/plugin/test/src/plug_me_in_eclipse_3_4/Activator.java index 9b32215b10..c8daf84edf 100644 --- a/plugins/eclipse/testData/round/plugin/test/src/plug_me_in_eclipse_3_4/Activator.java +++ b/plugins/eclipse/testData/round/plugin/test/src/plug_me_in_eclipse_3_4/Activator.java @@ -1,3 +1,18 @@ +/* + * 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 plug_me_in_eclipse_3_4; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/plugins/eclipse/testData/round/plugin/test/src/plug_me_in_eclipse_3_4/actions/SampleAction.java b/plugins/eclipse/testData/round/plugin/test/src/plug_me_in_eclipse_3_4/actions/SampleAction.java index c4e7ccc17a..d1e064b9c0 100644 --- a/plugins/eclipse/testData/round/plugin/test/src/plug_me_in_eclipse_3_4/actions/SampleAction.java +++ b/plugins/eclipse/testData/round/plugin/test/src/plug_me_in_eclipse_3_4/actions/SampleAction.java @@ -1,3 +1,18 @@ +/* + * 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 plug_me_in_eclipse_3_4.actions; import org.eclipse.jface.action.IAction; diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseClasspathTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseClasspathTest.java index e8a206e0f3..71ff6f83be 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseClasspathTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseClasspathTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java index 3c97fccd4b..f8c4a7a99b 100644 --- a/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java +++ b/plugins/eclipse/testSources/org/jetbrains/idea/eclipse/EclipseImlTest.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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. */ /* diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringConfigurable.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringConfigurable.java index 77b6822f08..d81fe5fe46 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringConfigurable.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringConfigurable.java @@ -1,3 +1,18 @@ +/* + * 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 org.jetbrains.generate.tostring; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringWorker.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringWorker.java index 03aa89bb04..2df8a1dd4b 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringWorker.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/GenerateToStringWorker.java @@ -1,4 +1,20 @@ /* + * 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. + */ + +/* * @author max */ package org.jetbrains.generate.tostring; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/config/DuplicatonPolicy.java similarity index 56% copy from plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java copy to plugins/generate-tostring/src/org/jetbrains/generate/tostring/config/DuplicatonPolicy.java index 91556fe81b..4e771629c9 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntBuildModel.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/config/DuplicatonPolicy.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -14,23 +14,25 @@ * limitations under the License. */ -package com.intellij.lang.ant.config; - -import org.jetbrains.annotations.Nullable; - -public interface AntBuildModel { - @Nullable - String getDefaultTargetName(); +/* + * @author max + */ +package org.jetbrains.generate.tostring.config; - AntBuildTarget[] getTargets(); +public enum DuplicatonPolicy { + ASK("Ask"), + REPLACE("Replace existing"), + DUPLICATE("Generate duplicating method"); - AntBuildTarget[] getFilteredTargets(); + private final String displayName; - AntBuildFile getBuildFile(); + DuplicatonPolicy(String displayName) { + this.displayName = displayName; + } - @Nullable - AntBuildTarget findTarget(final String name); - @Nullable - String getName(); + @Override + public String toString() { + return displayName; + } } diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/config/InsertWhere.java similarity index 54% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/generate-tostring/src/org/jetbrains/generate/tostring/config/InsertWhere.java index f044a3bc10..4f66bd4647 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/config/InsertWhere.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; -import com.intellij.psi.PsiElement; - -/** - * @author dyoma +/* + * @author max */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +package org.jetbrains.generate.tostring.config; + +public enum InsertWhere { + AT_CARET("At caret"), + AFTER_EQUALS_AND_HASHCODE("After equals() and hashCode()"), + AT_THE_END_OF_A_CLASS("At the end of class"); + + private final String displayName; + + InsertWhere(String displayName) { + this.displayName = displayName; + } + + @Override + public String toString() { + return displayName; + } } diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplatesManager.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplatesManager.java index 071d2ab6e3..567d3ea2f7 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplatesManager.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplatesManager.java @@ -1,4 +1,20 @@ /* + * 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. + */ + +/* * @author max */ package org.jetbrains.generate.tostring.template; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplatesState.java similarity index 64% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplatesState.java index f044a3bc10..735d6fa34f 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplatesState.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; -import com.intellij.psi.PsiElement; - -/** - * @author dyoma +/* + * @author max */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); -} +package org.jetbrains.generate.tostring.template; + +import java.util.ArrayList; +import java.util.List; + +public class TemplatesState { + public String defaultTempalteName = ""; + public List templates = new ArrayList(); +} \ No newline at end of file diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/TemplatesPanel.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/TemplatesPanel.java index 0b53308842..2c2fffb0ca 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/TemplatesPanel.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/TemplatesPanel.java @@ -1,4 +1,20 @@ /* + * 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. + */ + +/* * @author max */ package org.jetbrains.generate.tostring.view; diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/ToStringTemplateConfigurable.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/ToStringTemplateConfigurable.java index c891562b76..6fd82ed640 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/ToStringTemplateConfigurable.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/view/ToStringTemplateConfigurable.java @@ -1,4 +1,20 @@ /* + * 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. + */ + +/* * @author max */ package org.jetbrains.generate.tostring.view; diff --git a/plugins/git4idea/src/git4idea/GitBranch.java b/plugins/git4idea/src/git4idea/GitBranch.java index 2069e0856e..e5ad45503d 100644 --- a/plugins/git4idea/src/git4idea/GitBranch.java +++ b/plugins/git4idea/src/git4idea/GitBranch.java @@ -1,22 +1,19 @@ -package git4idea; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Copyright 2008 JetBrains s.r.o. - * Authors: gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.VcsException; diff --git a/plugins/git4idea/src/git4idea/GitBranchesSearcher.java b/plugins/git4idea/src/git4idea/GitBranchesSearcher.java index 8b33d449a6..8b14e51e5c 100644 --- a/plugins/git4idea/src/git4idea/GitBranchesSearcher.java +++ b/plugins/git4idea/src/git4idea/GitBranchesSearcher.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 git4idea; diff --git a/plugins/git4idea/src/git4idea/GitContentRevision.java b/plugins/git4idea/src/git4idea/GitContentRevision.java index be0e77c32f..4eeed34c70 100644 --- a/plugins/git4idea/src/git4idea/GitContentRevision.java +++ b/plugins/git4idea/src/git4idea/GitContentRevision.java @@ -1,22 +1,19 @@ -package git4idea; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Copyright 2008 JetBrains s.r.o. - * Authors: gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.FilePath; diff --git a/plugins/git4idea/src/git4idea/GitFileRevision.java b/plugins/git4idea/src/git4idea/GitFileRevision.java index 3a3c63e219..296e52ae39 100644 --- a/plugins/git4idea/src/git4idea/GitFileRevision.java +++ b/plugins/git4idea/src/git4idea/GitFileRevision.java @@ -1,21 +1,19 @@ -package git4idea; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Authors: gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.FilePath; diff --git a/plugins/git4idea/src/git4idea/GitReference.java b/plugins/git4idea/src/git4idea/GitReference.java index e191fdc5f6..66b960e655 100644 --- a/plugins/git4idea/src/git4idea/GitReference.java +++ b/plugins/git4idea/src/git4idea/GitReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/GitRemote.java b/plugins/git4idea/src/git4idea/GitRemote.java index 4137ce2fca..f13bb8df04 100644 --- a/plugins/git4idea/src/git4idea/GitRemote.java +++ b/plugins/git4idea/src/git4idea/GitRemote.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/GitRevisionNumber.java b/plugins/git4idea/src/git4idea/GitRevisionNumber.java index 49e5900c81..9b81ba013c 100644 --- a/plugins/git4idea/src/git4idea/GitRevisionNumber.java +++ b/plugins/git4idea/src/git4idea/GitRevisionNumber.java @@ -1,21 +1,19 @@ -package git4idea; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Authors: gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.VcsException; diff --git a/plugins/devkit/src/util/ActionData.java b/plugins/git4idea/src/git4idea/GitRevisionSelector.java similarity index 56% copy from plugins/devkit/src/util/ActionData.java copy to plugins/git4idea/src/git4idea/GitRevisionSelector.java index 04c436af9c..c4d6d70ab9 100644 --- a/plugins/devkit/src/util/ActionData.java +++ b/plugins/git4idea/src/git4idea/GitRevisionSelector.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2005 JetBrains s.r.o. + * 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. @@ -13,34 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.idea.devkit.util; +package git4idea; -import org.jetbrains.annotations.Nullable; +import com.intellij.openapi.vcs.diff.RevisionSelector; +import com.intellij.openapi.vcs.history.VcsRevisionNumber; +import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** - * @author swr + * Git revision selector class. */ -public interface ActionData { - @NotNull - String getActionId(); - - @NotNull - String getActionText(); - - String getActionDescription(); - - @Nullable - String getSelectedGroupId(); - - @Nullable - String getSelectedActionId(); - - String getSelectedAnchor(); - - @Nullable - String getFirstKeyStroke(); - +public class GitRevisionSelector implements RevisionSelector { + /** + * {@inheritDoc} + */ @Nullable - String getSecondKeyStroke(); + public VcsRevisionNumber selectNumber(@NotNull VirtualFile file) { + //GitVirtualFile gitFile = (GitVirtualFile) file; + //TODO: implement selectNumber() + return null; + } } diff --git a/plugins/git4idea/src/git4idea/GitRootConverter.java b/plugins/git4idea/src/git4idea/GitRootConverter.java index ccb7b9db38..c91aef0580 100644 --- a/plugins/git4idea/src/git4idea/GitRootConverter.java +++ b/plugins/git4idea/src/git4idea/GitRootConverter.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 git4idea; diff --git a/plugins/git4idea/src/git4idea/GitTag.java b/plugins/git4idea/src/git4idea/GitTag.java index fc55715b84..79557e85f8 100644 --- a/plugins/git4idea/src/git4idea/GitTag.java +++ b/plugins/git4idea/src/git4idea/GitTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/GitUtil.java b/plugins/git4idea/src/git4idea/GitUtil.java index 5dd6488f1e..18d83a6531 100644 --- a/plugins/git4idea/src/git4idea/GitUtil.java +++ b/plugins/git4idea/src/git4idea/GitUtil.java @@ -1,23 +1,19 @@ -package git4idea; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Copyright 2008 JetBrains s.r.o. - * - * Authors: gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; diff --git a/plugins/git4idea/src/git4idea/GitVcs.java b/plugins/git4idea/src/git4idea/GitVcs.java index 9bf85bd917..321932153d 100644 --- a/plugins/git4idea/src/git4idea/GitVcs.java +++ b/plugins/git4idea/src/git4idea/GitVcs.java @@ -1,21 +1,19 @@ -package git4idea; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Authors: gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea; import com.intellij.execution.ui.ConsoleViewContentType; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/git4idea/src/git4idea/actions/BasicAction.java b/plugins/git4idea/src/git4idea/actions/BasicAction.java index eae20e0f20..1473f77a23 100644 --- a/plugins/git4idea/src/git4idea/actions/BasicAction.java +++ b/plugins/git4idea/src/git4idea/actions/BasicAction.java @@ -1,21 +1,19 @@ -package git4idea.actions; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Authors: gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea.actions; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; diff --git a/plugins/git4idea/src/git4idea/actions/GitAbstractRebaseResumeAction.java b/plugins/git4idea/src/git4idea/actions/GitAbstractRebaseResumeAction.java index 289da9e117..6f2ffc1b6f 100644 --- a/plugins/git4idea/src/git4idea/actions/GitAbstractRebaseResumeAction.java +++ b/plugins/git4idea/src/git4idea/actions/GitAbstractRebaseResumeAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitAdd.java b/plugins/git4idea/src/git4idea/actions/GitAdd.java index f61c76b0ec..79c5f4c403 100644 --- a/plugins/git4idea/src/git4idea/actions/GitAdd.java +++ b/plugins/git4idea/src/git4idea/actions/GitAdd.java @@ -1,21 +1,19 @@ -package git4idea.actions; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Authors: gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea.actions; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.FileStatus; diff --git a/plugins/git4idea/src/git4idea/actions/GitCheckout.java b/plugins/git4idea/src/git4idea/actions/GitCheckout.java index 0a378ca0da..413694612f 100644 --- a/plugins/git4idea/src/git4idea/actions/GitCheckout.java +++ b/plugins/git4idea/src/git4idea/actions/GitCheckout.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitCurrentBranch.java b/plugins/git4idea/src/git4idea/actions/GitCurrentBranch.java index fdfca5f073..02242e91c3 100644 --- a/plugins/git4idea/src/git4idea/actions/GitCurrentBranch.java +++ b/plugins/git4idea/src/git4idea/actions/GitCurrentBranch.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitFetch.java b/plugins/git4idea/src/git4idea/actions/GitFetch.java index bae145ccb1..2cd8d9c4a5 100644 --- a/plugins/git4idea/src/git4idea/actions/GitFetch.java +++ b/plugins/git4idea/src/git4idea/actions/GitFetch.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitInit.java b/plugins/git4idea/src/git4idea/actions/GitInit.java index 5058ff4427..05172f311a 100644 --- a/plugins/git4idea/src/git4idea/actions/GitInit.java +++ b/plugins/git4idea/src/git4idea/actions/GitInit.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java b/plugins/git4idea/src/git4idea/actions/GitMenu.java similarity index 53% copy from plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java copy to plugins/git4idea/src/git4idea/actions/GitMenu.java index e1da04a96a..0c7c13aa72 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntNoFileException.java +++ b/plugins/git4idea/src/git4idea/actions/GitMenu.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,20 +13,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package git4idea.actions; -package com.intellij.lang.ant.config; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.vcs.AbstractVcs; +import com.intellij.openapi.vcs.actions.StandardVcsGroup; +import git4idea.GitVcs; -import com.intellij.openapi.vfs.VirtualFile; - -public class AntNoFileException extends Exception { - private final VirtualFile myFile; - - public AntNoFileException(final String message, final VirtualFile file) { - super(message + file.getPresentableUrl()); - myFile = file; +/** + * Git VCS menu + */ +public class GitMenu extends StandardVcsGroup { + @Override + public AbstractVcs getVcs(Project project) { + return GitVcs.getInstance(project); } - public VirtualFile getFile() { - return myFile; + @Override + public String getVcsName(final Project project) { + return GitVcs.NAME; } -} +} \ No newline at end of file diff --git a/plugins/git4idea/src/git4idea/actions/GitMerge.java b/plugins/git4idea/src/git4idea/actions/GitMerge.java index 5e7d485361..afa5ba36a0 100644 --- a/plugins/git4idea/src/git4idea/actions/GitMerge.java +++ b/plugins/git4idea/src/git4idea/actions/GitMerge.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitMergeTool.java b/plugins/git4idea/src/git4idea/actions/GitMergeTool.java index d0f99c6f54..d00205acf0 100644 --- a/plugins/git4idea/src/git4idea/actions/GitMergeTool.java +++ b/plugins/git4idea/src/git4idea/actions/GitMergeTool.java @@ -1,22 +1,19 @@ -package git4idea.actions; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Copyright 2008 JetBrains s.r.o. - * Authors: mike.aizatsky,gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea.actions; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.AbstractVcsHelper; diff --git a/plugins/git4idea/src/git4idea/actions/GitPull.java b/plugins/git4idea/src/git4idea/actions/GitPull.java index c0ad6a586d..9b097fa904 100644 --- a/plugins/git4idea/src/git4idea/actions/GitPull.java +++ b/plugins/git4idea/src/git4idea/actions/GitPull.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitPush.java b/plugins/git4idea/src/git4idea/actions/GitPush.java index b998b3502d..949d9ccf72 100644 --- a/plugins/git4idea/src/git4idea/actions/GitPush.java +++ b/plugins/git4idea/src/git4idea/actions/GitPush.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitPushActiveBranches.java b/plugins/git4idea/src/git4idea/actions/GitPushActiveBranches.java index 3860debdb2..7b72a508fe 100644 --- a/plugins/git4idea/src/git4idea/actions/GitPushActiveBranches.java +++ b/plugins/git4idea/src/git4idea/actions/GitPushActiveBranches.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.actions; import com.intellij.openapi.project.Project; diff --git a/plugins/git4idea/src/git4idea/actions/GitRebase.java b/plugins/git4idea/src/git4idea/actions/GitRebase.java index 6787a4cf74..e3697e1993 100644 --- a/plugins/git4idea/src/git4idea/actions/GitRebase.java +++ b/plugins/git4idea/src/git4idea/actions/GitRebase.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.actions; import com.intellij.openapi.project.Project; diff --git a/plugins/git4idea/src/git4idea/actions/GitRebaseAbort.java b/plugins/git4idea/src/git4idea/actions/GitRebaseAbort.java index 918920f674..635e84dc5a 100644 --- a/plugins/git4idea/src/git4idea/actions/GitRebaseAbort.java +++ b/plugins/git4idea/src/git4idea/actions/GitRebaseAbort.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitRebaseActionBase.java b/plugins/git4idea/src/git4idea/actions/GitRebaseActionBase.java index df82e8d253..e69c9861ee 100644 --- a/plugins/git4idea/src/git4idea/actions/GitRebaseActionBase.java +++ b/plugins/git4idea/src/git4idea/actions/GitRebaseActionBase.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.actions; import com.intellij.openapi.project.Project; diff --git a/plugins/git4idea/src/git4idea/actions/GitRebaseContinue.java b/plugins/git4idea/src/git4idea/actions/GitRebaseContinue.java index c06bfb9b1b..1f4cb41fc1 100644 --- a/plugins/git4idea/src/git4idea/actions/GitRebaseContinue.java +++ b/plugins/git4idea/src/git4idea/actions/GitRebaseContinue.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitRebaseSkip.java b/plugins/git4idea/src/git4idea/actions/GitRebaseSkip.java index 489a8f3942..921f63010f 100644 --- a/plugins/git4idea/src/git4idea/actions/GitRebaseSkip.java +++ b/plugins/git4idea/src/git4idea/actions/GitRebaseSkip.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java b/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java index d402a8a6e2..17ef688893 100644 --- a/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java +++ b/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitResetHead.java b/plugins/git4idea/src/git4idea/actions/GitResetHead.java index 12d3410a5b..0e8bdba3ef 100644 --- a/plugins/git4idea/src/git4idea/actions/GitResetHead.java +++ b/plugins/git4idea/src/git4idea/actions/GitResetHead.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitRevert.java b/plugins/git4idea/src/git4idea/actions/GitRevert.java index 63ea50a280..f99b538fcd 100644 --- a/plugins/git4idea/src/git4idea/actions/GitRevert.java +++ b/plugins/git4idea/src/git4idea/actions/GitRevert.java @@ -1,21 +1,19 @@ -package git4idea.actions; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Authors: gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea.actions; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.FileStatus; diff --git a/plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java b/plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java index 9c0cb131d7..1ed1202a6d 100644 --- a/plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java +++ b/plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitStash.java b/plugins/git4idea/src/git4idea/actions/GitStash.java index c4e4ae3b4f..92457ddd86 100644 --- a/plugins/git4idea/src/git4idea/actions/GitStash.java +++ b/plugins/git4idea/src/git4idea/actions/GitStash.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitTag.java b/plugins/git4idea/src/git4idea/actions/GitTag.java index e40b22c26e..7dc6ea35fa 100644 --- a/plugins/git4idea/src/git4idea/actions/GitTag.java +++ b/plugins/git4idea/src/git4idea/actions/GitTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/actions/GitUnstash.java b/plugins/git4idea/src/git4idea/actions/GitUnstash.java index a9580b5a44..1938e82651 100644 --- a/plugins/git4idea/src/git4idea/actions/GitUnstash.java +++ b/plugins/git4idea/src/git4idea/actions/GitUnstash.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java index c21938a003..1c00728a75 100644 --- a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java +++ b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java @@ -1,17 +1,19 @@ -package git4idea.annotate; /* - * 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: + * Copyright 2000-2009 JetBrains s.r.o. * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Author: Anatol Pomozov (Copyright 2008) - * Copyright 2008 JetBrains s.r.o. + * 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 git4idea.annotate; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.progress.ProgressIndicator; diff --git a/plugins/git4idea/src/git4idea/annotate/GitFileAnnotation.java b/plugins/git4idea/src/git4idea/annotate/GitFileAnnotation.java index 1e6599bb8f..f3acc97830 100644 --- a/plugins/git4idea/src/git4idea/annotate/GitFileAnnotation.java +++ b/plugins/git4idea/src/git4idea/annotate/GitFileAnnotation.java @@ -1,17 +1,19 @@ -package git4idea.annotate; /* - * 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: + * Copyright 2000-2009 JetBrains s.r.o. * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Author: Anatol Pomozov (Copyright 2008) - * Copyright 2008 JetBrains s.r.o. + * 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 git4idea.annotate; import com.intellij.openapi.editor.EditorGutterAction; import com.intellij.openapi.project.Project; diff --git a/plugins/git4idea/src/git4idea/changes/ChangeCollector.java b/plugins/git4idea/src/git4idea/changes/ChangeCollector.java index 8bb1c98219..ed2bffb1f6 100644 --- a/plugins/git4idea/src/git4idea/changes/ChangeCollector.java +++ b/plugins/git4idea/src/git4idea/changes/ChangeCollector.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/changes/GitChangeList.java b/plugins/git4idea/src/git4idea/changes/GitChangeList.java index 01d2db21c0..378902b5b5 100644 --- a/plugins/git4idea/src/git4idea/changes/GitChangeList.java +++ b/plugins/git4idea/src/git4idea/changes/GitChangeList.java @@ -1,17 +1,19 @@ -package git4idea.changes; /* - * 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: + * Copyright 2000-2009 JetBrains s.r.o. * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Copyright 2008 MQSoftware - * Authors: Mark Scott + * 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 git4idea.changes; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.LocalChangeList; diff --git a/plugins/git4idea/src/git4idea/changes/GitChangeProvider.java b/plugins/git4idea/src/git4idea/changes/GitChangeProvider.java index a5778e2766..2aa76be7ff 100644 --- a/plugins/git4idea/src/git4idea/changes/GitChangeProvider.java +++ b/plugins/git4idea/src/git4idea/changes/GitChangeProvider.java @@ -1,22 +1,19 @@ -package git4idea.changes; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Copyright 2008 JetBrains s.r.o. - * Authors: gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea.changes; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; diff --git a/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java b/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java index 38dd46da2e..20823c1705 100644 --- a/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java +++ b/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.changes; import com.intellij.openapi.project.Project; diff --git a/plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java b/plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java index 0eeaae6887..c3f9a1ee64 100644 --- a/plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java +++ b/plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.changes; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java b/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java index 31c806cee9..7b1868ed3c 100644 --- a/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java +++ b/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.changes; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/git4idea/src/git4idea/changes/GitRepositoryLocation.java b/plugins/git4idea/src/git4idea/changes/GitRepositoryLocation.java index 2bc1974b5d..7d6d631fcf 100644 --- a/plugins/git4idea/src/git4idea/changes/GitRepositoryLocation.java +++ b/plugins/git4idea/src/git4idea/changes/GitRepositoryLocation.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 git4idea.changes; diff --git a/plugins/git4idea/src/git4idea/changes/GitVersionFilterComponent.java b/plugins/git4idea/src/git4idea/changes/GitVersionFilterComponent.java index 97308dc803..e280070b40 100644 --- a/plugins/git4idea/src/git4idea/changes/GitVersionFilterComponent.java +++ b/plugins/git4idea/src/git4idea/changes/GitVersionFilterComponent.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.changes; import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings; diff --git a/plugins/git4idea/src/git4idea/changes/TestOutgoingAction.java b/plugins/git4idea/src/git4idea/changes/TestOutgoingAction.java index 6f12189bb3..173c2f8d09 100644 --- a/plugins/git4idea/src/git4idea/changes/TestOutgoingAction.java +++ b/plugins/git4idea/src/git4idea/changes/TestOutgoingAction.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.changes; import com.intellij.openapi.actionSystem.AnAction; diff --git a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java index 3d29577221..77d94a1e2d 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java +++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java @@ -1,20 +1,17 @@ /* - * 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: + * Copyright 2000-2009 JetBrains s.r.o. * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Copyright 2008 JetBrains s.r.o. - * Authors: gevession, Erlend Simonsen & Mark Scott - * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea.checkin; diff --git a/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java b/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java index e915cebcfa..f8ebb6730e 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java +++ b/plugins/git4idea/src/git4idea/checkin/GitPushActiveBranchesDialog.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.checkin; import com.intellij.openapi.progress.ProgressManager; diff --git a/plugins/git4idea/src/git4idea/checkin/GitPushDialog.java b/plugins/git4idea/src/git4idea/checkin/GitPushDialog.java index ce8fe3a2e9..1c9bf34d18 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitPushDialog.java +++ b/plugins/git4idea/src/git4idea/checkin/GitPushDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/checkin/GitPushUtils.java b/plugins/git4idea/src/git4idea/checkin/GitPushUtils.java index 01a9871b66..b0377abc01 100644 --- a/plugins/git4idea/src/git4idea/checkin/GitPushUtils.java +++ b/plugins/git4idea/src/git4idea/checkin/GitPushUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/checkout/GitCheckoutDialog.java b/plugins/git4idea/src/git4idea/checkout/GitCheckoutDialog.java index f11ed4d84c..eb9cfa0071 100644 --- a/plugins/git4idea/src/git4idea/checkout/GitCheckoutDialog.java +++ b/plugins/git4idea/src/git4idea/checkout/GitCheckoutDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/checkout/GitCheckoutProvider.java b/plugins/git4idea/src/git4idea/checkout/GitCheckoutProvider.java index d0bbdbf065..13a5ca0e83 100644 --- a/plugins/git4idea/src/git4idea/checkout/GitCheckoutProvider.java +++ b/plugins/git4idea/src/git4idea/checkout/GitCheckoutProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/checkout/GitCloneDialog.java b/plugins/git4idea/src/git4idea/checkout/GitCloneDialog.java index 9928064482..d91653c30a 100644 --- a/plugins/git4idea/src/git4idea/checkout/GitCloneDialog.java +++ b/plugins/git4idea/src/git4idea/checkout/GitCloneDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/commands/GitHandler.java b/plugins/git4idea/src/git4idea/commands/GitHandler.java index c53f994541..1a877accdd 100644 --- a/plugins/git4idea/src/git4idea/commands/GitHandler.java +++ b/plugins/git4idea/src/git4idea/commands/GitHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/commands/GitHandlerListener.java b/plugins/git4idea/src/git4idea/commands/GitHandlerListener.java index d540272d33..a90d704591 100644 --- a/plugins/git4idea/src/git4idea/commands/GitHandlerListener.java +++ b/plugins/git4idea/src/git4idea/commands/GitHandlerListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/commands/GitHandlerUtil.java b/plugins/git4idea/src/git4idea/commands/GitHandlerUtil.java index ac77519482..e4072ae93f 100644 --- a/plugins/git4idea/src/git4idea/commands/GitHandlerUtil.java +++ b/plugins/git4idea/src/git4idea/commands/GitHandlerUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/commands/GitLineHandler.java b/plugins/git4idea/src/git4idea/commands/GitLineHandler.java index 7e9996e18c..a3948a2ab3 100644 --- a/plugins/git4idea/src/git4idea/commands/GitLineHandler.java +++ b/plugins/git4idea/src/git4idea/commands/GitLineHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/commands/GitLineHandlerAdapter.java b/plugins/git4idea/src/git4idea/commands/GitLineHandlerAdapter.java index fc9ae33260..6197fd792a 100644 --- a/plugins/git4idea/src/git4idea/commands/GitLineHandlerAdapter.java +++ b/plugins/git4idea/src/git4idea/commands/GitLineHandlerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/commands/GitLineHandlerListener.java b/plugins/git4idea/src/git4idea/commands/GitLineHandlerListener.java index e47f67c626..365d3e5926 100644 --- a/plugins/git4idea/src/git4idea/commands/GitLineHandlerListener.java +++ b/plugins/git4idea/src/git4idea/commands/GitLineHandlerListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/commands/GitSimpleHandler.java b/plugins/git4idea/src/git4idea/commands/GitSimpleHandler.java index f43cfb2d5c..3ca45b4320 100644 --- a/plugins/git4idea/src/git4idea/commands/GitSimpleHandler.java +++ b/plugins/git4idea/src/git4idea/commands/GitSimpleHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/commands/ScriptGenerator.java b/plugins/git4idea/src/git4idea/commands/ScriptGenerator.java index 7d038f05ed..ce7ca1017e 100644 --- a/plugins/git4idea/src/git4idea/commands/ScriptGenerator.java +++ b/plugins/git4idea/src/git4idea/commands/ScriptGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/commands/StringScanner.java b/plugins/git4idea/src/git4idea/commands/StringScanner.java index 4a929b78dd..47e3d48510 100644 --- a/plugins/git4idea/src/git4idea/commands/StringScanner.java +++ b/plugins/git4idea/src/git4idea/commands/StringScanner.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/config/GitConfigUtil.java b/plugins/git4idea/src/git4idea/config/GitConfigUtil.java index 3f7ac1e237..f64fa8ffad 100644 --- a/plugins/git4idea/src/git4idea/config/GitConfigUtil.java +++ b/plugins/git4idea/src/git4idea/config/GitConfigUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/config/GitVcsConfigurable.java b/plugins/git4idea/src/git4idea/config/GitVcsConfigurable.java index 45795cd8ce..551b26d707 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsConfigurable.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsConfigurable.java @@ -1,21 +1,19 @@ -package git4idea.config; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Authors: gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea.config; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; diff --git a/plugins/git4idea/src/git4idea/config/GitVcsPanel.java b/plugins/git4idea/src/git4idea/config/GitVcsPanel.java index f5889e15e2..d0c71c9b46 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsPanel.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsPanel.java @@ -1,21 +1,19 @@ -package git4idea.config; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Authors: gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea.config; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.project.Project; diff --git a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java index 00c23dcc66..ac07f689e3 100644 --- a/plugins/git4idea/src/git4idea/config/GitVcsSettings.java +++ b/plugins/git4idea/src/git4idea/config/GitVcsSettings.java @@ -1,24 +1,19 @@ -package git4idea.config; /* - * 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. - * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Copyright 2008 JetBrains s.r.o. * Copyright 2000-2009 JetBrains s.r.o. * - * Authors: gevession, Erlend Simonsen & Mark Scott + * 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 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea.config; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.PersistentStateComponent; diff --git a/plugins/git4idea/src/git4idea/config/GitVersion.java b/plugins/git4idea/src/git4idea/config/GitVersion.java index 797d847d68..9e12d93472 100644 --- a/plugins/git4idea/src/git4idea/config/GitVersion.java +++ b/plugins/git4idea/src/git4idea/config/GitVersion.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/diff/GitDiffProvider.java b/plugins/git4idea/src/git4idea/diff/GitDiffProvider.java index 3fc3658b31..7aab212a62 100644 --- a/plugins/git4idea/src/git4idea/diff/GitDiffProvider.java +++ b/plugins/git4idea/src/git4idea/diff/GitDiffProvider.java @@ -1,23 +1,19 @@ -package git4idea.diff; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Copyright 2008 JetBrains s.r.o. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Authors: gevession, Erlend Simonsen & Mark Scott - * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea.diff; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.FilePath; diff --git a/plugins/git4idea/src/git4idea/diff/GitTreeDiffProvider.java b/plugins/git4idea/src/git4idea/diff/GitTreeDiffProvider.java index dce4a1aef5..5af09b846f 100644 --- a/plugins/git4idea/src/git4idea/diff/GitTreeDiffProvider.java +++ b/plugins/git4idea/src/git4idea/diff/GitTreeDiffProvider.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 git4idea.diff; diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java b/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java index dc73fba39c..5209cd8259 100644 --- a/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java +++ b/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java @@ -1,22 +1,19 @@ -package git4idea.history; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Copyright 2008 JetBrains s.r.o. - * Authors: gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea.history; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.diagnostic.Logger; diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java index f1d8bd0a2b..2fbbd6ff86 100644 --- a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java +++ b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/i18n/GitBundle.java b/plugins/git4idea/src/git4idea/i18n/GitBundle.java index 456d8ab229..eb9d41941e 100644 --- a/plugins/git4idea/src/git4idea/i18n/GitBundle.java +++ b/plugins/git4idea/src/git4idea/i18n/GitBundle.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.i18n; /* * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance diff --git a/plugins/git4idea/src/git4idea/merge/GitMergeDialog.java b/plugins/git4idea/src/git4idea/merge/GitMergeDialog.java index 7e115f984b..f7ff3d7911 100644 --- a/plugins/git4idea/src/git4idea/merge/GitMergeDialog.java +++ b/plugins/git4idea/src/git4idea/merge/GitMergeDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java b/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java index 3bbdb11631..1a3c4474e8 100644 --- a/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java +++ b/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java @@ -1,18 +1,19 @@ -package git4idea.merge; /* - * 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: + * Copyright 2000-2009 JetBrains s.r.o. * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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 * - * 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. + * http://www.apache.org/licenses/LICENSE-2.0 * - * Copyright 2008 MQSoftware - * Copyright 2008 JetBrains s.r.o. - * Author: Mark Scott + * 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 git4idea.merge; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; diff --git a/plugins/git4idea/src/git4idea/merge/GitMergeUtil.java b/plugins/git4idea/src/git4idea/merge/GitMergeUtil.java index 6758e82817..1d4ed282ca 100644 --- a/plugins/git4idea/src/git4idea/merge/GitMergeUtil.java +++ b/plugins/git4idea/src/git4idea/merge/GitMergeUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/merge/GitPullDialog.java b/plugins/git4idea/src/git4idea/merge/GitPullDialog.java index 1ecb1e462b..2e3f5945ce 100644 --- a/plugins/git4idea/src/git4idea/merge/GitPullDialog.java +++ b/plugins/git4idea/src/git4idea/merge/GitPullDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java b/plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java index e1dde0fdc7..bc505a6b27 100644 --- a/plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java +++ b/plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseActionDialog.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseActionDialog.java index 7d8d8b8575..179b3f9c60 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseActionDialog.java +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseActionDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseDialog.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseDialog.java index 448de80d93..09ab20f857 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseDialog.java +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseEditor.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseEditor.java index 4122c0b2ca..1277778f4d 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseEditor.java +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorHandler.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorHandler.java index 8f0ed7fc19..9a75576af8 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorHandler.java +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorMain.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorMain.java index 696c8a7c19..c3c16307cd 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorMain.java +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorMain.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorService.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorService.java index 1a3f1d9f2a..45628f74a3 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorService.java +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseEditorService.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseEntry.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseEntry.java index e39266d180..c31107f449 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseEntry.java +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseEntry.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseLineListener.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseLineListener.java index 10bdbac1d0..b5ab7ceee4 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseLineListener.java +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseLineListener.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.rebase; import com.intellij.execution.process.ProcessOutputTypes; diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.java index ec2129bf53..f00cd81e8f 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.java +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseUnstructuredEditor.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.rebase; import com.intellij.openapi.project.Project; diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseUtils.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseUtils.java index 64161c6922..2c160793c5 100644 --- a/plugins/git4idea/src/git4idea/rebase/GitRebaseUtils.java +++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java b/plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java index 2dbfa6a375..d1c19a4830 100644 --- a/plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java +++ b/plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/ui/CurrentBranchDialog.java b/plugins/git4idea/src/git4idea/ui/CurrentBranchDialog.java index 7916107ffc..f760356f51 100644 --- a/plugins/git4idea/src/git4idea/ui/CurrentBranchDialog.java +++ b/plugins/git4idea/src/git4idea/ui/CurrentBranchDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/ui/GitFetchDialog.java b/plugins/git4idea/src/git4idea/ui/GitFetchDialog.java index 2848571a48..688e5b0617 100644 --- a/plugins/git4idea/src/git4idea/ui/GitFetchDialog.java +++ b/plugins/git4idea/src/git4idea/ui/GitFetchDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/ui/GitReferenceValidator.java b/plugins/git4idea/src/git4idea/ui/GitReferenceValidator.java index 2463a5fd45..ff6036d6db 100644 --- a/plugins/git4idea/src/git4idea/ui/GitReferenceValidator.java +++ b/plugins/git4idea/src/git4idea/ui/GitReferenceValidator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/ui/GitRefspecAddRefsDialog.java b/plugins/git4idea/src/git4idea/ui/GitRefspecAddRefsDialog.java index eab4402ae9..f961e818ca 100644 --- a/plugins/git4idea/src/git4idea/ui/GitRefspecAddRefsDialog.java +++ b/plugins/git4idea/src/git4idea/ui/GitRefspecAddRefsDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/ui/GitRefspecPanel.java b/plugins/git4idea/src/git4idea/ui/GitRefspecPanel.java index 90358c822e..368c8ae849 100644 --- a/plugins/git4idea/src/git4idea/ui/GitRefspecPanel.java +++ b/plugins/git4idea/src/git4idea/ui/GitRefspecPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/ui/GitResetDialog.java b/plugins/git4idea/src/git4idea/ui/GitResetDialog.java index 0e8d1869e7..69abaad5fb 100644 --- a/plugins/git4idea/src/git4idea/ui/GitResetDialog.java +++ b/plugins/git4idea/src/git4idea/ui/GitResetDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/ui/GitStashDialog.java b/plugins/git4idea/src/git4idea/ui/GitStashDialog.java index dd2145cb17..1f8a04acbb 100644 --- a/plugins/git4idea/src/git4idea/ui/GitStashDialog.java +++ b/plugins/git4idea/src/git4idea/ui/GitStashDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/ui/GitTagDialog.java b/plugins/git4idea/src/git4idea/ui/GitTagDialog.java index 88d227dc19..c62ea38100 100644 --- a/plugins/git4idea/src/git4idea/ui/GitTagDialog.java +++ b/plugins/git4idea/src/git4idea/ui/GitTagDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/ui/GitUIUtil.java b/plugins/git4idea/src/git4idea/ui/GitUIUtil.java index b574ed833e..bcd9a9014b 100644 --- a/plugins/git4idea/src/git4idea/ui/GitUIUtil.java +++ b/plugins/git4idea/src/git4idea/ui/GitUIUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java index 0e582d0b0d..63e8ab62ca 100644 --- a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java +++ b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/update/GitStashUtils.java b/plugins/git4idea/src/git4idea/update/GitStashUtils.java index ce65994c50..b404d884c2 100644 --- a/plugins/git4idea/src/git4idea/update/GitStashUtils.java +++ b/plugins/git4idea/src/git4idea/update/GitStashUtils.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.update; import com.intellij.openapi.project.Project; diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateConfigurable.java b/plugins/git4idea/src/git4idea/update/GitUpdateConfigurable.java index 107b6a79ad..a7dafe0aa5 100644 --- a/plugins/git4idea/src/git4idea/update/GitUpdateConfigurable.java +++ b/plugins/git4idea/src/git4idea/update/GitUpdateConfigurable.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.update; import com.intellij.openapi.options.Configurable; diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java b/plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java index 8184a2c742..67c03abcc5 100644 --- a/plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java +++ b/plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java b/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java index aa5bc34c5a..4a3ed956fa 100644 --- a/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java +++ b/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.update; import com.intellij.openapi.project.Project; diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.java b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.java index feb3af53bc..f4f0f1c17a 100644 --- a/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.java +++ b/plugins/git4idea/src/git4idea/update/GitUpdateOptionsPanel.java @@ -1,3 +1,18 @@ +/* + * 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 git4idea.update; import git4idea.config.GitVcsSettings; diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateSession.java b/plugins/git4idea/src/git4idea/update/GitUpdateSession.java index 80e4bae552..e45b9d83c5 100644 --- a/plugins/git4idea/src/git4idea/update/GitUpdateSession.java +++ b/plugins/git4idea/src/git4idea/update/GitUpdateSession.java @@ -1,17 +1,19 @@ -package git4idea.update; /* -* 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. -* -* Copyright 2008 MQSoftware -* Authors: Mark Scott -*/ + * 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 git4idea.update; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.update.UpdateSession; diff --git a/plugins/git4idea/src/git4idea/validators/GitBranchNameValidator.java b/plugins/git4idea/src/git4idea/validators/GitBranchNameValidator.java index 89b14de4ba..0f4c5a90de 100644 --- a/plugins/git4idea/src/git4idea/validators/GitBranchNameValidator.java +++ b/plugins/git4idea/src/git4idea/validators/GitBranchNameValidator.java @@ -1,22 +1,19 @@ -package git4idea.validators; /* - * 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 + * Copyright 2000-2009 JetBrains s.r.o. * - * 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. + * 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 * - * Copyright 2007 Decentrix Inc - * Copyright 2007 Aspiro AS - * Copyright 2008 MQSoftware - * Copyright 2008 JetBrains s.r.o. - * Authors: gevession, Erlend Simonsen & Mark Scott + * http://www.apache.org/licenses/LICENSE-2.0 * - * This code was originally derived from the MKS & Mercurial IDEA VCS plugins + * 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 git4idea.validators; import com.intellij.openapi.ui.InputValidator; diff --git a/plugins/git4idea/src/git4idea/vfs/GitConfigListener.java b/plugins/git4idea/src/git4idea/vfs/GitConfigListener.java index de61d133d7..a333e17dd5 100644 --- a/plugins/git4idea/src/git4idea/vfs/GitConfigListener.java +++ b/plugins/git4idea/src/git4idea/vfs/GitConfigListener.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 git4idea.vfs; diff --git a/plugins/git4idea/src/git4idea/vfs/GitConfigTracker.java b/plugins/git4idea/src/git4idea/vfs/GitConfigTracker.java index db62df779f..7760d5bfab 100644 --- a/plugins/git4idea/src/git4idea/vfs/GitConfigTracker.java +++ b/plugins/git4idea/src/git4idea/vfs/GitConfigTracker.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 git4idea.vfs; diff --git a/plugins/git4idea/src/git4idea/vfs/GitFileTypeFactory.java b/plugins/git4idea/src/git4idea/vfs/GitFileTypeFactory.java index e961cfd413..d22a5e2081 100644 --- a/plugins/git4idea/src/git4idea/vfs/GitFileTypeFactory.java +++ b/plugins/git4idea/src/git4idea/vfs/GitFileTypeFactory.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 git4idea.vfs; diff --git a/plugins/git4idea/src/git4idea/vfs/GitFixRootsDialog.java b/plugins/git4idea/src/git4idea/vfs/GitFixRootsDialog.java index 45a0752b4f..bdf673de4d 100644 --- a/plugins/git4idea/src/git4idea/vfs/GitFixRootsDialog.java +++ b/plugins/git4idea/src/git4idea/vfs/GitFixRootsDialog.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 git4idea.vfs; diff --git a/plugins/git4idea/src/git4idea/vfs/GitIgnoreTracker.java b/plugins/git4idea/src/git4idea/vfs/GitIgnoreTracker.java index 8ba3f471db..1a0c3441e9 100644 --- a/plugins/git4idea/src/git4idea/vfs/GitIgnoreTracker.java +++ b/plugins/git4idea/src/git4idea/vfs/GitIgnoreTracker.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 git4idea.vfs; diff --git a/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java b/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java index f012884786..c0295a11e6 100644 --- a/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java +++ b/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 git4idea.vfs; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/AntConfigurationListener.java b/plugins/git4idea/src/git4idea/vfs/GitRootsListener.java similarity index 56% copy from plugins/ant/src/com/intellij/lang/ant/config/AntConfigurationListener.java copy to plugins/git4idea/src/git4idea/vfs/GitRootsListener.java index 0dca8ce522..44a1ed4e28 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/AntConfigurationListener.java +++ b/plugins/git4idea/src/git4idea/vfs/GitRootsListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -14,16 +14,19 @@ * limitations under the License. */ -package com.intellij.lang.ant.config; +package git4idea.vfs; import java.util.EventListener; -public interface AntConfigurationListener extends EventListener { - void configurationLoaded(); - - void buildFileChanged(final AntBuildFile buildFile); - - void buildFileAdded(final AntBuildFile buildFile); - - void buildFileRemoved(final AntBuildFile buildFile); +/** + * The listener interface that allows tracking actual changes in + * the vcs root configuration. + */ +public interface GitRootsListener extends EventListener { + /** + * The method is invoked when set of actual roots changes. + * This could happen when the list of configured roots changes or when + * ".git" directories added/removed for the configured roots. + */ + void gitRootsChanged(); } diff --git a/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java b/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java index 536c7eee64..a4fb4ad299 100644 --- a/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java +++ b/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHGUIHandler.java b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHGUIHandler.java index b8d312961e..724b3af3e8 100644 --- a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHGUIHandler.java +++ b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHGUIHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHHandler.java b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHHandler.java index d1246d21ce..04dbd1968e 100644 --- a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHHandler.java +++ b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHIdeaClient.java b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHIdeaClient.java index a4b0ce5163..35173acd4c 100644 --- a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHIdeaClient.java +++ b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHIdeaClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHService.java b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHService.java index 368e1028cb..3522b2fc96 100644 --- a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHService.java +++ b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/GitSSHService.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHConfig.java b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHConfig.java index 4d5c1d3a0f..e9e03bfb70 100644 --- a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHConfig.java +++ b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHMain.java b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHMain.java index 3afde23f02..e4c948ae2c 100644 --- a/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHMain.java +++ b/plugins/git4idea/src/org/jetbrains/git4idea/ssh/SSHMain.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2008 JetBrains s.r.o. + * 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. diff --git a/plugins/git4idea/tests/git4idea/tests/GitRemoteTest.java b/plugins/git4idea/tests/git4idea/tests/GitRemoteTest.java index d20d549bdb..eef3d172ec 100644 --- a/plugins/git4idea/tests/git4idea/tests/GitRemoteTest.java +++ b/plugins/git4idea/tests/git4idea/tests/GitRemoteTest.java @@ -1,17 +1,17 @@ /* * 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 + * 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 + * 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. + * 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 git4idea.tests; diff --git a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java b/plugins/git4idea/tests/git4idea/tests/GitUtilsTest.java similarity index 59% copy from plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java copy to plugins/git4idea/tests/git4idea/tests/GitUtilsTest.java index f044a3bc10..7e90f054e2 100644 --- a/plugins/ant/src/com/intellij/lang/ant/PsiAntElement.java +++ b/plugins/git4idea/tests/git4idea/tests/GitUtilsTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2007 JetBrains s.r.o. + * 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. @@ -13,14 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.intellij.lang.ant; +package git4idea.tests; -import com.intellij.psi.PsiElement; +import git4idea.GitUtil; +import org.junit.Assert; +import org.junit.Test; /** - * @author dyoma + * The test for utility classes */ -public interface PsiAntElement extends PsiElement { - AntElementRole getRole(); - boolean canRename(); +public class GitUtilsTest { + @Test + public void testFormatLongRev() { + Assert.assertEquals("0000000000000000", GitUtil.formatLongRev(0)); + Assert.assertEquals("fffffffffffffffe", GitUtil.formatLongRev(-2)); + } } diff --git a/plugins/svn4idea/svn4idea.iml b/plugins/svn4idea/svn4idea.iml index 14fb4417e9..fd765b4005 100644 --- a/plugins/svn4idea/svn4idea.iml +++ b/plugins/svn4idea/svn4idea.iml @@ -47,7 +47,6 @@ - -- 2.11.4.GIT