matthiasblaesing closed pull request #352: Integrate CND team changes in
platform
URL: https://github.com/apache/incubator-netbeans/pull/352
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/java.api.common/manifest.mf b/java.api.common/manifest.mf
index 46a3ada5a..966055dba 100644
--- a/java.api.common/manifest.mf
+++ b/java.api.common/manifest.mf
@@ -1,4 +1,4 @@
Manifest-Version: 1.0
OpenIDE-Module: org.netbeans.modules.java.api.common/0
OpenIDE-Module-Localizing-Bundle:
org/netbeans/modules/java/api/common/resources/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.123
+OpenIDE-Module-Specification-Version: 1.124
diff --git a/java.api.common/nbproject/project.xml
b/java.api.common/nbproject/project.xml
index 2a7aea84a..fe0820e2e 100644
--- a/java.api.common/nbproject/project.xml
+++ b/java.api.common/nbproject/project.xml
@@ -444,6 +444,7 @@
</test-type>
</test-dependencies>
<friend-packages>
+ <friend>com.sun.tools.java.analysis.parfait</friend>
<friend>org.netbeans.modules.android.project</friend>
<friend>org.netbeans.modules.apisupport.ant</friend>
<friend>org.netbeans.modules.avatar_js.project</friend>
diff --git
a/team.commons/src/org/netbeans/modules/bugtracking/commons/UndoRedoSupport.java
b/team.commons/src/org/netbeans/modules/bugtracking/commons/UndoRedoSupport.java
index eb09805e3..fa9be689a 100644
---
a/team.commons/src/org/netbeans/modules/bugtracking/commons/UndoRedoSupport.java
+++
b/team.commons/src/org/netbeans/modules/bugtracking/commons/UndoRedoSupport.java
@@ -135,10 +135,13 @@ public void undoableEditHappened(UndoableEditEvent e) {
processDocumentChange(component);
return;
}
- AbstractDocument.DefaultDocumentEvent event =
(AbstractDocument.DefaultDocumentEvent) e.getEdit();
- if (event.getType().equals(DocumentEvent.EventType.CHANGE)) {
- edit.addEdit(e.getEdit());
- return;
+ //AbstractDocument.DefaultDocumentEvent event =
(AbstractDocument.DefaultDocumentEvent) e.getEdit();
+ UndoableEdit event = e.getEdit();
+ if (event instanceof DocumentEvent) {
+ if
(((DocumentEvent)event).getType().equals(DocumentEvent.EventType.CHANGE)) {
+ edit.addEdit(e.getEdit());
+ return;
+ }
}
int offsetChange = component.getCaretPosition() - lastOffset;
int lengthChange = component.getDocument().getLength() -
lastLength;
diff --git
a/versioning.util/src/org/netbeans/modules/versioning/util/UndoRedoSupport.java
b/versioning.util/src/org/netbeans/modules/versioning/util/UndoRedoSupport.java
index 588a1a20d..bc8214641 100644
---
a/versioning.util/src/org/netbeans/modules/versioning/util/UndoRedoSupport.java
+++
b/versioning.util/src/org/netbeans/modules/versioning/util/UndoRedoSupport.java
@@ -108,10 +108,13 @@ public void undoableEditHappened(UndoableEditEvent e) {
processDocumentChange();
return;
}
- AbstractDocument.DefaultDocumentEvent event =
(AbstractDocument.DefaultDocumentEvent) e.getEdit();
- if (event.getType().equals(DocumentEvent.EventType.CHANGE)) {
- edit.addEdit(e.getEdit());
- return;
+ //AbstractDocument.DefaultDocumentEvent event =
(AbstractDocument.DefaultDocumentEvent) e.getEdit();
+ UndoableEdit event = e.getEdit();
+ if (event instanceof DocumentEvent) {
+ if
(((DocumentEvent)event).getType().equals(DocumentEvent.EventType.CHANGE)) {
+ edit.addEdit(e.getEdit());
+ return;
+ }
}
int offsetChange = component.getCaretPosition() - lastOffset;
int lengthChange = component.getDocument().getLength() -
lastLength;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
