Legal Notices

From 6b7ac471e3f5f700fd080730e9e56505b02654ae Mon Sep 17 00:00:00 2001 From: Alex Coles Date: Fri, 4 Apr 2008 01:04:22 +0200 Subject: [PATCH] Added various missing project metadata files to allow module to run in NB. Added skeleton for JavaHelp. Updated project name and metadata. --- .../org/netbeans/modules/git/docs/credits.html | 63 ++++++++++++ javahelp/org/netbeans/modules/git/docs/git.hs | 27 ++++++ manifest.mf | 7 +- nbproject/project.properties | 3 + nbproject/project.xml | 2 +- src/org/netbeans/modules/git/Bundle.properties | 5 +- src/org/netbeans/modules/git/GitVCS.java | 2 +- .../netbeans/modules/git/resources/git-helpset.xml | 3 + .../netbeans/modules/git/resources/git-layer.xml | 106 +++++++++++++++++++++ .../modules/git/resources/git_annotation.xml | 53 +++++++++++ .../netbeans/modules/git/resources/git_wstcref.xml | 52 ++++++++++ .../modules/git/resources/gitversioning.xml | 49 ++++++++++ .../modules/git/ui/commit/CommitOptions.java | 2 +- 13 files changed, 366 insertions(+), 8 deletions(-) create mode 100644 javahelp/org/netbeans/modules/git/docs/credits.html create mode 100644 javahelp/org/netbeans/modules/git/docs/git.hs create mode 100644 src/org/netbeans/modules/git/resources/git-helpset.xml create mode 100644 src/org/netbeans/modules/git/resources/git-layer.xml create mode 100644 src/org/netbeans/modules/git/resources/git_annotation.xml create mode 100644 src/org/netbeans/modules/git/resources/git_wstcref.xml create mode 100644 src/org/netbeans/modules/git/resources/gitversioning.xml diff --git a/javahelp/org/netbeans/modules/git/docs/credits.html b/javahelp/org/netbeans/modules/git/docs/credits.html new file mode 100644 index 0000000..3511f0a --- /dev/null +++ b/javahelp/org/netbeans/modules/git/docs/credits.html @@ -0,0 +1,63 @@ + + + + +Legal Notices + + + + +

DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.

+ +

The contents of this file are subject to the terms of either the GNU +General Public License Version 2 only ("GPL") or the Common +Development and Distribution License("CDDL") (collectively, the +"License"). You may not use this file except in compliance with the +License. You can obtain a copy of the License at +http://www.netbeans.org/cddl-gplv2.html +or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the +specific language governing permissions and limitations under the +License. When distributing the software, include this License Header +Notice in each file and include the License file at +nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this +particular file as subject to the "Classpath" exception as provided +by Sun in the GPL Version 2 section of the License file that +accompanied this code. If applicable, add the following below the +License Header, with the fields enclosed by brackets [] replaced by +your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"

+ +

Contributor(s):

+ +

If you wish your version of this file to be governed by only the CDDL +or only the GPL Version 2, indicate your decision by adding +"[Contributor] elects to include this software in this distribution +under the [CDDL or GPL Version 2] license." If you do not indicate a +single choice of license, a recipient has the option to distribute +your version of this file under either the CDDL, the GPL Version 2 or +to extend the choice of license to its licensees as provided above. +However, if you add GPL Version 2 code and therefore, elected the GPL +Version 2 license, then the option applies only if the new code is +made subject to such option by the copyright holder. +

+ +

Note: Sun is not responsible for the availability of third-party web +sites mentioned in this document and does not endorse and is not +responsible or liable for any content, advertising, products, or other +materials on or available from such sites or resources. Sun will not be +responsible or liable for any damage or loss caused or alleged to be +caused by or in connection with use of or reliance on any such content, +goods, or services available on or through any such sites or resources.

+ + + + \ No newline at end of file diff --git a/javahelp/org/netbeans/modules/git/docs/git.hs b/javahelp/org/netbeans/modules/git/docs/git.hs new file mode 100644 index 0000000..335a2f7 --- /dev/null +++ b/javahelp/org/netbeans/modules/git/docs/git.hs @@ -0,0 +1,27 @@ + + + + Git Help + + org.netbeans.modules.git.about + + + + TOC + Table of Contents + javax.help.TOCView + git-toc.xml + + + Index + Index + javax.help.IndexView + git-idx.xml + + + Search + Search + javax.help.SearchView + JavaHelpSearch + + \ No newline at end of file diff --git a/manifest.mf b/manifest.mf index 6030738..92b553c 100644 --- a/manifest.mf +++ b/manifest.mf @@ -1,6 +1,7 @@ Manifest-Version: 1.0 AutoUpdate-Show-In-Client: true -OpenIDE-Module: org.netbeans.git +OpenIDE-Module: org.netbeans.modules.git/1 +OpenIDE-Module-Layer: org/netbeans/modules/git/resources/git-layer.xml +OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/git/Bundle.properties +OpenIDE-Module-Requires: org.netbeans.api.javahelp.Help OpenIDE-Module-Specification-Version: 1.6 -X-COMMENT: Main-Class will be added automatically by build - diff --git a/nbproject/project.properties b/nbproject/project.properties index ec04c31..d6f1e81 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -2,7 +2,10 @@ javac.compilerargs=-Xlint:unchecked javac.source=1.5 javahelp.base=org/netbeans/modules/git/docs javahelp.hs=git.hs + license.file=LICENSE + nbm.homepage=http://open.ikonoklastik.com/ nbm.module.author=Alex Coles nbm.needs.restart=true + diff --git a/nbproject/project.xml b/nbproject/project.xml index e795c0c..310d046 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -3,7 +3,7 @@ org.netbeans.modules.apisupport.project - org.netbeans.git + org.netbeans.modules.git

diff --git a/src/org/netbeans/modules/git/Bundle.properties b/src/org/netbeans/modules/git/Bundle.properties index 28ff718..2a175d7 100644 --- a/src/org/netbeans/modules/git/Bundle.properties +++ b/src/org/netbeans/modules/git/Bundle.properties @@ -38,9 +38,10 @@ # Version 2 license, then the option applies only if the new code is # made subject to such option by the copyright holder. -OpenIDE-Module-Display-Category=Base IDE +OpenIDE-Module-Display-Category=Versioning OpenIDE-Module-Long-Description=\ - Integrates Git functionality into NetBeans IDE + Integrates the Git version control system into NetBeans IDE. \ + Provides support for a full-range of Git features including project cloning, file diffs, commits, and pushing and pulling changes to and from remote repositories. OpenIDE-Module-Name=Git OpenIDE-Module-Short-Description=Git Versioning System diff --git a/src/org/netbeans/modules/git/GitVCS.java b/src/org/netbeans/modules/git/GitVCS.java index 0a96151..4ff4be4 100644 --- a/src/org/netbeans/modules/git/GitVCS.java +++ b/src/org/netbeans/modules/git/GitVCS.java @@ -113,7 +113,7 @@ public class GitVCS extends VersioningSystem implements PropertyChangeListener, Git.getInstance().getOriginalFile(workingCopy, originalFile); } - //@SuppressWarnings("unchecked") // Property Change event.getNewValue returning Object + @SuppressWarnings("unchecked") // Property Change event.getNewValue returning Object public void propertyChange(PropertyChangeEvent event) { if (event.getPropertyName().equals(FileStatusCache.PROP_FILE_STATUS_CHANGED)) { FileStatusCache.ChangedEvent changedEvent = (FileStatusCache.ChangedEvent) event.getNewValue(); diff --git a/src/org/netbeans/modules/git/resources/git-helpset.xml b/src/org/netbeans/modules/git/resources/git-helpset.xml new file mode 100644 index 0000000..7545a8d --- /dev/null +++ b/src/org/netbeans/modules/git/resources/git-helpset.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/org/netbeans/modules/git/resources/git-layer.xml b/src/org/netbeans/modules/git/resources/git-layer.xml new file mode 100644 index 0000000..285b162 --- /dev/null +++ b/src/org/netbeans/modules/git/resources/git-layer.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/org/netbeans/modules/git/resources/git_annotation.xml b/src/org/netbeans/modules/git/resources/git_annotation.xml new file mode 100644 index 0000000..2e1a8b4 --- /dev/null +++ b/src/org/netbeans/modules/git/resources/git_annotation.xml @@ -0,0 +1,53 @@ + + + + \ No newline at end of file diff --git a/src/org/netbeans/modules/git/resources/git_wstcref.xml b/src/org/netbeans/modules/git/resources/git_wstcref.xml new file mode 100644 index 0000000..02f9504 --- /dev/null +++ b/src/org/netbeans/modules/git/resources/git_wstcref.xml @@ -0,0 +1,52 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/org/netbeans/modules/git/resources/gitversioning.xml b/src/org/netbeans/modules/git/resources/gitversioning.xml new file mode 100644 index 0000000..af77a1b --- /dev/null +++ b/src/org/netbeans/modules/git/resources/gitversioning.xml @@ -0,0 +1,49 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/org/netbeans/modules/git/ui/commit/CommitOptions.java b/src/org/netbeans/modules/git/ui/commit/CommitOptions.java index fceacf6..b1d6447 100644 --- a/src/org/netbeans/modules/git/ui/commit/CommitOptions.java +++ b/src/org/netbeans/modules/git/ui/commit/CommitOptions.java @@ -69,7 +69,7 @@ abstract class CommitOptions { super(bundleKey); } } - + static class Commit extends CommitOptions { public Commit(String bundleKey) { -- 2.11.4.GIT