# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: /space/nbsrc/core # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: nbproject/project.xml *** /space/nbsrc/core/nbproject/project.xml Base (1.30) --- /space/nbsrc/core/nbproject/project.xml Locally Modified (Based On 1.30) *************** *** 129,142 **** - org.openide.text - - - - 6.16 - - - org.openide.util --- 129,134 ---- *************** *** 196,201 **** --- 188,194 ---- org.netbeans.core.windows org.netbeans.modules.form org.netbeans.modules.i18n + org.netbeans.modules.indentationbridge org.netbeans.modules.java org.netbeans.modules.javadoc org.netbeans.modules.javahelp Index: nbproject/project.properties *** /space/nbsrc/core/nbproject/project.properties Base (1.30) --- /space/nbsrc/core/nbproject/project.properties Locally Modified (Based On 1.30) *************** *** 17,23 **** javac.compilerargs=-Xlint:unchecked javac.source=1.5 ! spec.version.base=3.6.0 javadoc.arch=${basedir}/arch/arch-core.xml --- 17,23 ---- javac.compilerargs=-Xlint:unchecked javac.source=1.5 ! spec.version.base=3.6.1 javadoc.arch=${basedir}/arch/arch-core.xml Index: src/org/netbeans/beaninfo/Bundle.properties *** /space/nbsrc/core/src/org/netbeans/beaninfo/Bundle.properties Base (1.52) --- /space/nbsrc/core/src/org/netbeans/beaninfo/Bundle.properties Locally Modified (Based On 1.52) *************** *** 19,27 **** PROP_valid=Valid HINT_valid=If True, this filesystem is valid and usable. - LAB_IndentEngine=Indentation Engines - HINT_IndentEngine=All types of indentation engines registered in the system. - LAB_IndentEngineDefault=No Indentation HINT_IndentEngineDefault=No Indentation --- 19,24 ---- Index: src/org/netbeans/beaninfo/IndentEngineBeanInfo.java *** /space/nbsrc/core/src/org/netbeans/beaninfo/IndentEngineBeanInfo.java Base (1.13) --- /space/nbsrc/core/src/org/netbeans/beaninfo/IndentEngineBeanInfo.java Locally Deleted *************** *** 1,65 **** - /* - * The contents of this file are subject to the terms of the Common Development - * and Distribution License (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.html - * or http://www.netbeans.org/cddl.txt. - * - * When distributing Covered Code, include this CDDL Header Notice in each file - * and include the License file at http://www.netbeans.org/cddl.txt. - * If applicable, add the following below the CDDL Header, with the fields - * enclosed by brackets [] replaced by your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun - * Microsystems, Inc. All Rights Reserved. - */ - - package org.netbeans.beaninfo; - - import java.awt.Image; - - import java.beans.*; - import java.util.ResourceBundle; - import org.openide.util.Exceptions; - - import org.openide.util.NbBundle; - import org.openide.util.Utilities; - - /** Object that provides beaninfo for all indentation engines. - * - * @author Jaroslav Tulach - */ - public class IndentEngineBeanInfo extends SimpleBeanInfo { - - public BeanDescriptor getBeanDescriptor () { - BeanDescriptor descr = new BeanDescriptor (org.openide.text.IndentEngine.class); - ResourceBundle bundle = NbBundle.getBundle(IndentEngineBeanInfo.class); - descr.setDisplayName (bundle.getString ("LAB_IndentEngine")); // NOI18N - descr.setShortDescription (bundle.getString ("HINT_IndentEngine")); // NOI18N - descr.setValue("global", Boolean.TRUE); // NOI18N - - return descr; - } - - public BeanInfo[] getAdditionalBeanInfo () { - try { - return new BeanInfo[] { Introspector.getBeanInfo (org.openide.ServiceType.class) }; - } catch (IntrospectionException ie) { - Exceptions.printStackTrace(ie); - return null; - } - } - - /** - * Return the icon - */ - public Image getIcon(int type) { - if ((type == java.beans.BeanInfo.ICON_COLOR_16x16) || (type == java.beans.BeanInfo.ICON_MONO_16x16)) - return Utilities.loadImage("org/netbeans/core/resources/indentEngines.gif"); // NOI18N - else - return Utilities.loadImage("org/netbeans/core/resources/indentEngines.gif"); // NOI18N - } - } --- 1,0 ---- Index: manifest.mf *** /space/nbsrc/core/manifest.mf Base (1.48) --- /space/nbsrc/core/manifest.mf Locally Modified (Based On 1.48) Index: src/org/netbeans/beaninfo/IndentEngine.java *** /space/nbsrc/core/src/org/netbeans/beaninfo/IndentEngine.java Base (1.6) --- /space/nbsrc/core/src/org/netbeans/beaninfo/IndentEngine.java Locally Deleted *************** *** 1,64 **** - /* - * The contents of this file are subject to the terms of the Common Development - * and Distribution License (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.html - * or http://www.netbeans.org/cddl.txt. - * - * When distributing Covered Code, include this CDDL Header Notice in each file - * and include the License file at http://www.netbeans.org/cddl.txt. - * If applicable, add the following below the CDDL Header, with the fields - * enclosed by brackets [] replaced by your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun - * Microsystems, Inc. All Rights Reserved. - */ - - package org.netbeans.beaninfo; - - import java.beans.*; - import java.util.ResourceBundle; - import org.openide.util.Exceptions; - import org.openide.util.NbBundle; - - /** - * - * @author jtulach - */ - public abstract class IndentEngine { - private IndentEngine () {} - /** Object that provides beaninfo for {@link DebuggerType.Default}. - * - * @author Jaroslav Tulach - */ - public static class DefaultBeanInfo extends SimpleBeanInfo { - - public BeanDescriptor getBeanDescriptor () { - Class c; - try { - c = Class.forName("org.openide.text.IndentEngine$Default"); // NOI18N - } catch (Exception e) { - throw new IllegalStateException(); - } - BeanDescriptor descr = new BeanDescriptor (c); - ResourceBundle bundle = NbBundle.getBundle(IndentEngine.class); - - descr.setDisplayName (bundle.getString("LAB_IndentEngineDefault")); - descr.setShortDescription (bundle.getString("HINT_IndentEngineDefault")); - return descr; - } - - public BeanInfo[] getAdditionalBeanInfo () { - try { - return new BeanInfo[] { Introspector.getBeanInfo (org.openide.text.IndentEngine.class) }; - } catch (IntrospectionException ie) { - Exceptions.printStackTrace(ie); - return null; - } - } - - } - } --- 1,0 ---- Index: src/org/netbeans/beaninfo/editors/IndentEngineEditor.java *** /space/nbsrc/core/src/org/netbeans/beaninfo/editors/IndentEngineEditor.java Base (1.7) --- /space/nbsrc/core/src/org/netbeans/beaninfo/editors/IndentEngineEditor.java Locally Deleted *************** *** 1,38 **** - /* - * The contents of this file are subject to the terms of the Common Development - * and Distribution License (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.html - * or http://www.netbeans.org/cddl.txt. - * - * When distributing Covered Code, include this CDDL Header Notice in each file - * and include the License file at http://www.netbeans.org/cddl.txt. - * If applicable, add the following below the CDDL Header, with the fields - * enclosed by brackets [] replaced by your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * The Original Software is NetBeans. The Initial Developer of the Original - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun - * Microsystems, Inc. All Rights Reserved. - */ - - package org.netbeans.beaninfo.editors; - - import java.io.*; - - import org.openide.loaders.*; - import org.openide.text.IndentEngine; - - /** Support for property editor for indentation engine. - * - * @author Jaroslav Tulach - */ - - public class IndentEngineEditor extends ServiceTypeEditor { - - public IndentEngineEditor () { - super (IndentEngine.class, "LAB_ChooseIndentEngine"); // NOI18N - } - - } --- 1,0 ----