← Back to branch summary

~ubuntu-branches/ubuntu/quantal/netbeans/quantal

« back to all changes in this revision

Viewing changes to languages/diff/src/org/netbeans/modules/languages/diff/DiffExample.diff

  • Committer: Bazaar Package Importer
  • Author(s): Marek Slama
  • Date: 2008-01-29 14:11:22 UTC
  • Revision ID: james.westby@ubuntu.com-20080129141122-fnzjbo11ntghxfu7
Tags: upstream-6.0.1
Import upstream version 6.0.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
languages/diff/src/org/netbeans/modules/languages/diff/DiffExample.diff
 
1
Index: src/org/netbeans/modules/languages/Language.java
 
2
===================================================================
 
3
retrieving revision 1.19
 
4
--- src/org/netbeans/modules/languages/Language.java    12 May 2006 06:22:07 -0000      1.19
 
5
+++ src/org/netbeans/modules/languages/Language.java    12 May 2006 09:09:24 -0000
 
6
@@ -70,24 +70,43 @@
 
7
         return (AttributeSet) colorings.get (token);
 
8
     }
 
9
-    public String getFold (String nt) {
 
10
-        return (String) folds.get (nt);
 
11
+    public String getFold (String mimeType, String id) {
 
12
+        if (m == null) return null;
 
13
@@ -176,21 +195,47 @@
 
14
     
 
15
     private Map folds = new HashMap ();
 
16
         // import grammar rues