Please use the Apache issue tracking system for new NetBeans issues (https://issues.apache.org/jira/projects/NETBEANS0/issues) !!
View | Details | Raw Unified | Return to bug 201208 | Differences between
and this patch

Collapse All | Expand All

(-)cnd.source/nbproject/project.properties (-1 / +1 lines)
 Lines 1-3    Link Here 
1
javac.source=1.6
1
javac.source=1.6
2
javac.compilerargs=-Xlint -Xlint:-serial
2
javac.compilerargs=-Xlint -Xlint:-serial
3
spec.version.base=1.5.1
3
spec.version.base=1.5.2
(-)cnd.source/src/org/netbeans/modules/cnd/source/CppEditorSupport.java (-1 / +15 lines)
 Lines 51-56    Link Here 
51
import javax.swing.text.DefaultEditorKit;
51
import javax.swing.text.DefaultEditorKit;
52
import javax.swing.text.EditorKit;
52
import javax.swing.text.EditorKit;
53
import javax.swing.text.StyledDocument;
53
import javax.swing.text.StyledDocument;
54
import org.netbeans.modules.cnd.source.spi.CndPaneProvider;
54
55
55
import org.netbeans.modules.cnd.support.ReadOnlySupport;
56
import org.netbeans.modules.cnd.support.ReadOnlySupport;
56
import org.netbeans.modules.cnd.utils.cache.CndFileUtils;
57
import org.netbeans.modules.cnd.utils.cache.CndFileUtils;
 Lines 67-72    Link Here 
67
import org.openide.filesystems.FileObject;
68
import org.openide.filesystems.FileObject;
68
import org.openide.loaders.MultiDataObject;
69
import org.openide.loaders.MultiDataObject;
69
import org.openide.text.DataEditorSupport;
70
import org.openide.text.DataEditorSupport;
71
import org.openide.util.Lookup;
70
import org.openide.util.lookup.InstanceContent;
72
import org.openide.util.lookup.InstanceContent;
71
import org.openide.windows.CloneableOpenSupport;
73
import org.openide.windows.CloneableOpenSupport;
72
74
 Lines 100-107    Link Here 
100
    public CppEditorSupport(SourceDataObject obj) {
102
    public CppEditorSupport(SourceDataObject obj) {
101
        super(obj, new Environment(obj));
103
        super(obj, new Environment(obj));
102
        this.ic = obj.getInstanceContent();
104
        this.ic = obj.getInstanceContent();
105
        this.ic.add(obj.getNodeDelegate());
103
    }
106
    }
104
105
    /** 
107
    /** 
106
     * Overrides superclass method. Adds adding of save cookie if the document has been marked modified.
108
     * Overrides superclass method. Adds adding of save cookie if the document has been marked modified.
107
     * @return true if the environment accepted being marked as modified
109
     * @return true if the environment accepted being marked as modified
 Lines 195-200    Link Here 
195
        return ""; // NOI18N
197
        return ""; // NOI18N
196
    }
198
    }
197
199
200
    @Override
201
    protected Pane createPane() {
202
        CndPaneProvider provider = Lookup.getDefault().lookup(CndPaneProvider.class);
203
        if (provider != null) {
204
            Pane pane = provider.createPane(this);
205
            if (pane != null) {
206
                return pane;
207
            }
208
        }
209
        return super.createPane();
210
    }
211
198
    /** Nested class. Environment for this support. Extends <code>DataEditorSupport.Env</code> abstract class. */
212
    /** Nested class. Environment for this support. Extends <code>DataEditorSupport.Env</code> abstract class. */
199
    private static class Environment extends DataEditorSupport.Env {
213
    private static class Environment extends DataEditorSupport.Env {
200
214
(-)cnd.source/src/org/netbeans/modules/cnd/source/spi/CndPaneProvider.java (+63 lines)
Added Link Here 
1
/*
2
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3
 *
4
 * Copyright 2011 Oracle and/or its affiliates. All rights reserved.
5
 *
6
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
7
 * Other names may be trademarks of their respective owners.
8
 *
9
 * The contents of this file are subject to the terms of either the GNU
10
 * General Public License Version 2 only ("GPL") or the Common
11
 * Development and Distribution License("CDDL") (collectively, the
12
 * "License"). You may not use this file except in compliance with the
13
 * License. You can obtain a copy of the License at
14
 * http://www.netbeans.org/cddl-gplv2.html
15
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
16
 * specific language governing permissions and limitations under the
17
 * License.  When distributing the software, include this License Header
18
 * Notice in each file and include the License file at
19
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
20
 * particular file as subject to the "Classpath" exception as provided
21
 * by Oracle in the GPL Version 2 section of the License file that
22
 * accompanied this code. If applicable, add the following below the
23
 * License Header, with the fields enclosed by brackets [] replaced by
24
 * your own identifying information:
25
 * "Portions Copyrighted [year] [name of copyright owner]"
26
 *
27
 * If you wish your version of this file to be governed by only the CDDL
28
 * or only the GPL Version 2, indicate your decision by adding
29
 * "[Contributor] elects to include this software in this distribution
30
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
31
 * single choice of license, a recipient has the option to distribute
32
 * your version of this file under either the CDDL, the GPL Version 2 or
33
 * to extend the choice of license to its licensees as provided above.
34
 * However, if you add GPL Version 2 code and therefore, elected the GPL
35
 * Version 2 license, then the option applies only if the new code is
36
 * made subject to such option by the copyright holder.
37
 *
38
 * Contributor(s):
39
 *
40
 * Portions Copyrighted 2011 Sun Microsystems, Inc.
41
 */
42
package org.netbeans.modules.cnd.source.spi;
43
44
import org.openide.text.CloneableEditorSupport.Pane;
45
import org.openide.text.DataEditorSupport;
46
47
/**
48
 * If such a provider is defined, then for C/C++ data objects pane creation
49
 * is delegated to the provider. It can anyhow return null,
50
 * in which case standard pane will be created.
51
 * @author Vladimir Kvashin
52
 */
53
public interface CndPaneProvider {
54
55
    /**
56
     * The method is called each time an editor for C/C++ file is opened.
57
     * If method returns non null Pane, this pane is used for editing.
58
     * If it returns null, then standard C/C++ pane  is created.
59
     * @param DataEditorSupport 
60
     * @return Pane or null
61
     */
62
    Pane createPane(DataEditorSupport support);
63
}

Return to bug 201208
By use of this website, you agree to the NetBeans Policies and Terms of Use. © 2014, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo