MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

reverse copyright-to-java/jsp dependency

Browse Source 
GitOrigin-RevId: b0ee95ac712e612857b82abb7d4ba9060dc633f1
This commit is contained in:
Gregory.Shrago
2019-09-11 02:20:27 +03:00
committed by intellij-monorepo-bot
parent caac9ef3d8
commit efd8dea97c
13 changed files with 37 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/java-impl/intellij.java.impl.iml
View File

@@ -76,6 +76,7 @@
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module" module-name="intellij.copyright" />
</component>
<component name="copyright">
<Base>

20
plugins/copyright/src/com/maddyhome/idea/copyright/pattern/JavaCopyrightVariablesProvider.java → java/java-impl/src/com/intellij/copyright/JavaCopyrightVariablesProvider.java
View File

@@ -1,25 +1,13 @@
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR 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;
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.copyright;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiClassOwner;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiJavaFile;
import com.maddyhome.idea.copyright.pattern.CopyrightVariablesProvider;
import com.maddyhome.idea.copyright.pattern.FileInfo;
import org.jetbrains.annotations.NotNull;
import java.util.Map;

7
plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJavaFileCopyright.java → java/java-impl/src/com/intellij/copyright/UpdateJavaFileCopyright.java
View File

@@ -1,6 +1,6 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.maddyhome.idea.copyright.psi;
package com.intellij.copyright;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileType;
@@ -10,6 +10,9 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.maddyhome.idea.copyright.CopyrightProfile;
import com.maddyhome.idea.copyright.options.JavaOptions;
import com.maddyhome.idea.copyright.psi.UpdateCopyright;
import com.maddyhome.idea.copyright.psi.UpdateCopyrightsProvider;
import com.maddyhome.idea.copyright.psi.UpdatePsiFileCopyright;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;

21
plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateSPIFileCopyright.java → java/java-impl/src/com/intellij/copyright/UpdateSPIFileCopyright.java
View File

@@ -1,19 +1,5 @@
/*
* Copyright 2000-2013 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR 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;
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.copyright;
import com.intellij.lang.spi.SPILanguage;
import com.intellij.openapi.fileTypes.FileType;
@@ -22,6 +8,9 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.maddyhome.idea.copyright.CopyrightProfile;
import com.maddyhome.idea.copyright.psi.UpdateCopyright;
import com.maddyhome.idea.copyright.psi.UpdateCopyrightsProvider;
import com.maddyhome.idea.copyright.psi.UpdatePsiFileCopyright;
public class UpdateSPIFileCopyright extends UpdateCopyrightsProvider {
@Override

1
java/jsp-openapi/intellij.jsp.iml
View File

@@ -10,6 +10,7 @@
<orderEntry type="module" module-name="intellij.java" />
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="module" module-name="intellij.jsp.base" exported="" />
<orderEntry type="module" module-name="intellij.copyright" />
</component>
<component name="copyright">
<Base>

9
plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJspFileCopyright.java → java/jsp-openapi/src/com/intellij/copyright/UpdateJspFileCopyright.java
View File

@@ -1,6 +1,6 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.maddyhome.idea.copyright.psi;
package com.intellij.copyright;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileType;
@@ -15,6 +15,9 @@ import com.intellij.psi.xml.*;
import com.maddyhome.idea.copyright.CopyrightProfile;
import com.maddyhome.idea.copyright.options.LanguageOptions;
import com.maddyhome.idea.copyright.options.XmlOptions;
import com.maddyhome.idea.copyright.psi.UpdateCopyright;
import com.maddyhome.idea.copyright.psi.UpdateCopyrightsProvider;
import com.maddyhome.idea.copyright.psi.UpdatePsiFileCopyright;
public class UpdateJspFileCopyright extends UpdatePsiFileCopyright
{
@@ -183,7 +186,7 @@ public class UpdateJspFileCopyright extends UpdatePsiFileCopyright
@Override
public LanguageOptions getDefaultOptions() {
return createDefaultOptions(false);
return UpdateCopyrightsProvider.createDefaultOptions(false);
}
}
}

6
plugins/copyright/src/com/maddyhome/idea/copyright/psi/UpdateJspxFileCopyright.java → java/jsp-openapi/src/com/intellij/copyright/UpdateJspxFileCopyright.java
View File

@@ -1,6 +1,6 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.maddyhome.idea.copyright.psi;
package com.intellij.copyright;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.fileTypes.FileType;
@@ -16,6 +16,8 @@ import com.intellij.psi.xml.XmlProlog;
import com.maddyhome.idea.copyright.CopyrightProfile;
import com.maddyhome.idea.copyright.options.LanguageOptions;
import com.maddyhome.idea.copyright.options.XmlOptions;
import com.maddyhome.idea.copyright.psi.UpdateCopyright;
import com.maddyhome.idea.copyright.psi.UpdateCopyrightsProvider;
import java.util.ArrayList;

8
java/plugin/resources/META-INF/java-copyright.xml Normal file
View File

@@ -0,0 +1,8 @@
<idea-plugin>
<extensions defaultExtensionNs="com.intellij.copyright">
<updater filetype="JAVA" implementationClass="com.intellij.copyright.UpdateJavaFileCopyright$UpdateJavaCopyrightsProvider"/>
<updater filetype="SPI" implementationClass="com.intellij.copyright.UpdateSPIFileCopyright"/>
<variablesProvider filetype="JAVA" implementationClass="com.intellij.copyright.JavaCopyrightVariablesProvider"/>
</extensions>
</idea-plugin>

1
java/plugin/resources/META-INF/plugin.xml
View File

@@ -11,6 +11,7 @@
<depends>com.intellij.modules.xdebugger</depends>
<depends>com.intellij.modules.xml</depends>
<depends>com.intellij.modules.java-capable</depends>
<depends optional="true" config-file="java-copyright.xml">com.intellij.copyright</depends>
<xi:include href="/META-INF/JavaPlugin.xml" xpointer="xpointer(/idea-plugin/*)"/>

2
plugins/copyright/intellij.copyright.iml
View File

@@ -8,11 +8,9 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="intellij.jsp" />
<orderEntry type="module" module-name="intellij.xml" />
<orderEntry type="module" module-name="intellij.platform.lang" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.java" />
<orderEntry type="library" name="Velocity" level="project" />
<orderEntry type="library" name="commons-collections" level="project" />
<orderEntry type="module" module-name="intellij.xml.impl" />

10
plugins/copyright/src/META-INF/java.xml
View File

@@ -1,10 +0,0 @@
<idea-plugin>
<extensions defaultExtensionNs="com.intellij.copyright">
<updater filetype="JSPX" implementationClass="com.maddyhome.idea.copyright.psi.UpdateJspxFileCopyright$UpdateJspxCopyrightsProvider"/>
<updater filetype="JSP" implementationClass="com.maddyhome.idea.copyright.psi.UpdateJspFileCopyright$UpdateJspCopyrightsProvider"/>
<updater filetype="JAVA" implementationClass="com.maddyhome.idea.copyright.psi.UpdateJavaFileCopyright$UpdateJavaCopyrightsProvider"/>
<updater filetype="SPI" implementationClass="com.maddyhome.idea.copyright.psi.UpdateSPIFileCopyright"/>
<variablesProvider filetype="JAVA" implementationClass="com.maddyhome.idea.copyright.pattern.JavaCopyrightVariablesProvider"/>
</extensions>
</idea-plugin>

2
plugins/copyright/src/META-INF/plugin.xml
View File

@@ -5,7 +5,7 @@
Ensures that files in a project or module have a consistent copyright notice.
</description>
<vendor>JetBrains</vendor>
<depends optional="true" config-file="java.xml">com.intellij.modules.java</depends>
<depends>com.intellij.modules.platform</depends>
<extensions defaultExtensionNs="com.intellij">
<projectConfigurable groupId="editor" groupWeight="110" dynamic="true" displayName="Copyright" id="copyright"

2
plugins/groovy/src/org/jetbrains/plugins/groovy/copyright/UpdateGroovyCopyrightsProvider.java
View File

@@ -16,6 +16,7 @@
package org.jetbrains.plugins.groovy.copyright;
import com.intellij.copyright.UpdateJavaFileCopyright;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
@@ -27,7 +28,6 @@ import com.maddyhome.idea.copyright.CopyrightProfile;
import com.maddyhome.idea.copyright.options.JavaOptions;
import com.maddyhome.idea.copyright.psi.UpdateCopyright;
import com.maddyhome.idea.copyright.psi.UpdateCopyrightsProvider;
import com.maddyhome.idea.copyright.psi.UpdateJavaFileCopyright;
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement;
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GroovyScriptClass;