diff --git a/.project b/.project new file mode 100644 index 0000000..09d3c8b --- /dev/null +++ b/.project @@ -0,0 +1,11 @@ + + + Eclipse-Copyright-Generator + + + + + + + + diff --git a/README.adoc b/README.adoc index 4c080bf..8b23ddd 100644 --- a/README.adoc +++ b/README.adoc @@ -23,7 +23,9 @@ Plugin for Eclipse IDE to add and manage copyright headers at the beginning of t Fork of the link:http://sourceforge.net/projects/eclipsecopyrigh/[Eclipse Copyright Generator project] on sourceforge. Initial work by Eric Wuillai. -Contributors: Jeremie Bresson, Matthew Krupcale. +Contributors: Jeremie Bresson, Matthew Krupcale, Philippe Krief. + +This new version runs on *Eclipse Version: 2021-12 (4.22.0)* //end::description[] Read more about installation, usage on the link:{homepage}[project home page]. diff --git a/com.wdev91.eclipse.copyright.feature/feature.xml b/com.wdev91.eclipse.copyright.feature/feature.xml index 00bc5f6..4e244d5 100644 --- a/com.wdev91.eclipse.copyright.feature/feature.xml +++ b/com.wdev91.eclipse.copyright.feature/feature.xml @@ -2,7 +2,7 @@ @@ -48,11 +48,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - - + + + - + diff --git a/com.wdev91.eclipse.copyright/.classpath b/com.wdev91.eclipse.copyright/.classpath index 64c5e31..3628e33 100644 --- a/com.wdev91.eclipse.copyright/.classpath +++ b/com.wdev91.eclipse.copyright/.classpath @@ -1,6 +1,10 @@ - + + + + + diff --git a/com.wdev91.eclipse.copyright/.settings/org.eclipse.jdt.core.prefs b/com.wdev91.eclipse.copyright/.settings/org.eclipse.jdt.core.prefs index 416f4fb..d4540a5 100644 --- a/com.wdev91.eclipse.copyright/.settings/org.eclipse.jdt.core.prefs +++ b/com.wdev91.eclipse.copyright/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 +org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=17 diff --git a/com.wdev91.eclipse.copyright/META-INF/MANIFEST.MF b/com.wdev91.eclipse.copyright/META-INF/MANIFEST.MF index 1fccc9a..843281d 100644 --- a/com.wdev91.eclipse.copyright/META-INF/MANIFEST.MF +++ b/com.wdev91.eclipse.copyright/META-INF/MANIFEST.MF @@ -2,14 +2,14 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: com.wdev91.eclipse.copyright;singleton:=true -Bundle-Version: 1.5.3 +Bundle-Version: 1.6.2 Bundle-Activator: com.wdev91.eclipse.copyright.Activator Bundle-Vendor: %providerName -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0", - org.eclipse.core.resources;bundle-version="3.5.0", - org.eclipse.ui;bundle-version="3.5.0", - org.eclipse.ui.ide -Eclipse-LazyStart: true +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.core.resources;bundle-version="3.16.0", + org.eclipse.ui.ide;bundle-version="3.18.400" Bundle-ActivationPolicy: lazy Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 +Automatic-Module-Name: com.wdev91.eclipse.copyright diff --git a/com.wdev91.eclipse.copyright/plugin.xml b/com.wdev91.eclipse.copyright/plugin.xml index b7cd92f..bafbfcb 100644 --- a/com.wdev91.eclipse.copyright/plugin.xml +++ b/com.wdev91.eclipse.copyright/plugin.xml @@ -1,23 +1,6 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/Activator.java b/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/Activator.java index b0fc9d0..92e13f8 100644 --- a/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/Activator.java +++ b/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/Activator.java @@ -17,6 +17,7 @@ * The activator class controls the plug-in life cycle */ public class Activator extends AbstractUIPlugin { + /** The plug-in ID */ public static final String PLUGIN_ID = "com.wdev91.eclipse.copyright"; //$NON-NLS-1$ @@ -27,7 +28,6 @@ public class Activator extends AbstractUIPlugin { * The constructor */ public Activator() { - plugin = this; } /** @@ -46,6 +46,7 @@ public static Activator getDefault() { @Override public void start(BundleContext context) throws Exception { super.start(context); + plugin = this; } /* diff --git a/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/actions/ApplyCopyrightOnSelectionHandler.java b/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/actions/ApplyCopyrightOnSelectionHandler.java index f70464f..239932d 100644 --- a/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/actions/ApplyCopyrightOnSelectionHandler.java +++ b/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/actions/ApplyCopyrightOnSelectionHandler.java @@ -7,6 +7,7 @@ * * Contributors: * Eric Wuillai - initial API and implementation + * Philippe Krief - updated for Eclipse 4.x ******************************************************************************/ package com.wdev91.eclipse.copyright.actions; @@ -55,7 +56,13 @@ private void addFile(IResource res, List resources) { addFile(member, resources); } } catch (CoreException e) {} - } + } else if ( res instanceof IProject ) { + try { + for (IResource member : ((IProject) res).members(IFolder.EXCLUDE_DERIVED)) { + addFile(member, resources); + } + } catch (CoreException e) {} + } } public Object execute(ExecutionEvent event) throws ExecutionException { @@ -63,7 +70,7 @@ public Object execute(ExecutionEvent event) throws ExecutionException { List resources = new ArrayList(); IStructuredSelection selection = (IStructuredSelection) HandlerUtil.getActiveMenuSelection(event); for (Object sel : selection.toArray()) { - if ( sel instanceof IFile || sel instanceof IFolder ) { + if ( sel instanceof IFile || sel instanceof IFolder || sel instanceof IProject ) { addFile((IResource) sel, resources); } else { Object ao = null; @@ -120,7 +127,7 @@ private IResource findJavaResource(Object obj) { try { Method m = obj.getClass().getMethod("getResource"); //$NON-NLS-1$ Object res = m.invoke(obj); - if ( res instanceof IFile || res instanceof IFolder ) { + if ( res instanceof IFile || res instanceof IFolder || res instanceof IProject ) { return (IResource) res; } } catch (Exception e) { diff --git a/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/controls/CheckboxFilteredTree.java b/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/controls/CheckboxFilteredTree.java index 5be1a2a..5c30271 100644 --- a/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/controls/CheckboxFilteredTree.java +++ b/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/controls/CheckboxFilteredTree.java @@ -18,13 +18,8 @@ public class CheckboxFilteredTree extends FilteredTree { - public CheckboxFilteredTree(Composite parent, boolean useNewLook) { - super(parent, useNewLook); - } - - public CheckboxFilteredTree(Composite parent, int treeStyle, - PatternFilter filter, boolean useNewLook) { - super(parent, treeStyle, filter, useNewLook); + public CheckboxFilteredTree(Composite parent, int treeStyle, PatternFilter filter, boolean useNewLook) { + super(parent, treeStyle, filter, useNewLook, true); } @Override diff --git a/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/model/CopyrightManager.java b/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/model/CopyrightManager.java index ac8527c..f5c9f65 100644 --- a/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/model/CopyrightManager.java +++ b/com.wdev91.eclipse.copyright/src/com/wdev91/eclipse/copyright/model/CopyrightManager.java @@ -232,7 +232,7 @@ private static void applyCopyright(IFile file, final CopyrightSettings settings, String charset = file.getCharset(true); reader = new BufferedReader(new InputStreamReader(file.getContents(), charset)); - buffer = new StringWriter(new Long(f.length()).intValue()); + buffer = new StringWriter(Long.valueOf(f.length()).intValue()); writer = new PrintWriter(buffer); // Reads the first line of the file @@ -683,17 +683,17 @@ private static boolean isValidFile(IFile file, StringMatcher[] includeMatchers, } } } + HeaderFormat format = getHeaderFormat(settings, file, ct); + if ( format == null ) { + // No format defined for this content type or its parents + return false; + } else if ( format.isExcluded() ) { + // Content type excluded from copyright + return false; + } // Checks if the file already have a header if ( ! settings.isForceApply() ) { - HeaderFormat format = getHeaderFormat(settings, file, ct); - if ( format == null ) { - // No format defined for this content type or its parents - return false; - } else if ( format.isExcluded() ) { - // Content type excluded from copyright - return false; - } reader = new BufferedReader(new InputStreamReader(file.getContents())); String line = reader.readLine(); if ( line != null && format.skipFirstLine(line) ) { diff --git a/docs/pom.xml b/docs/pom.xml index 9e5a6f0..5b8e7ad 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -4,7 +4,7 @@ com.wdev91.eclipse.copyright docs - 1.5.3 + 1.6.0 pom @@ -22,7 +22,7 @@ UTF-8 - 1.5.3 + 1.6.0 1.5.4 3.0.0 9.0.5.0 diff --git a/pom.xml b/pom.xml index c81ae70..5989365 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.wdev91.eclipse.copyright root - 1.5.3 + 1.6 pom