1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/editor/completion/entries/CodeCompletionAtributes.java Wed Jun 16 14:44:01 2010 +0200
1.3 @@ -0,0 +1,61 @@
1.4 +/*
1.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
1.6 + *
1.7 + * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
1.8 + *
1.9 + * The contents of this file are subject to the terms of either the GNU
1.10 + * General Public License Version 2 only ("GPL") or the Common
1.11 + * Development and Distribution License("CDDL") (collectively, the
1.12 + * "License"). You may not use this file except in compliance with the
1.13 + * License. You can obtain a copy of the License at
1.14 + * http://www.netbeans.org/cddl-gplv2.html
1.15 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
1.16 + * specific language governing permissions and limitations under the
1.17 + * License. When distributing the software, include this License Header
1.18 + * Notice in each file and include the License file at
1.19 + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
1.20 + * particular file as subject to the "Classpath" exception as provided
1.21 + * by Sun in the GPL Version 2 section of the License file that
1.22 + * accompanied this code. If applicable, add the following below the
1.23 + * License Header, with the fields enclosed by brackets [] replaced by
1.24 + * your own identifying information:
1.25 + * "Portions Copyrighted [year] [name of copyright owner]"
1.26 + *
1.27 + * If you wish your version of this file to be governed by only the CDDL
1.28 + * or only the GPL Version 2, indicate your decision by adding
1.29 + * "[Contributor] elects to include this software in this distribution
1.30 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
1.31 + * single choice of license, a recipient has the option to distribute
1.32 + * your version of this file under either the CDDL, the GPL Version 2 or
1.33 + * to extend the choice of license to its licensees as provided above.
1.34 + * However, if you add GPL Version 2 code and therefore, elected the GPL
1.35 + * Version 2 license, then the option applies only if the new code is
1.36 + * made subject to such option by the copyright holder.
1.37 + *
1.38 + * Contributor(s):
1.39 + *
1.40 + * Portions Copyrighted 2010 Sun Microsystems, Inc.
1.41 + */
1.42 +
1.43 +package org.netbeans.modules.php.smarty.editor.completion.entries;
1.44 +
1.45 +/**
1.46 + *
1.47 + * @author Martin Fousek
1.48 + */
1.49 +public class CodeCompletionAtributes {
1.50 + private String attType, attRequired, attDefault, addDescription, attName;
1.51 +
1.52 + public CodeCompletionAtributes(String attType, String attRequired, String attDefault, String addDescription, String attName) {
1.53 + this.attType = attType;
1.54 + this.attRequired = attRequired;
1.55 + this.attDefault = attDefault;
1.56 + this.addDescription = addDescription;
1.57 + this.attName = attName;
1.58 + }
1.59 +
1.60 + public String getHelp() {
1.61 + return attName;
1.62 + }
1.63 +
1.64 +}
2.1 --- a/php.smarty/src/org/netbeans/modules/php/smarty/editor/completion/entries/CodeCompletionItemBuiltInFunctionsAtributes.java Tue Jun 15 15:42:30 2010 +0200
2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2.3 @@ -1,61 +0,0 @@
2.4 -/*
2.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
2.6 - *
2.7 - * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
2.8 - *
2.9 - * The contents of this file are subject to the terms of either the GNU
2.10 - * General Public License Version 2 only ("GPL") or the Common
2.11 - * Development and Distribution License("CDDL") (collectively, the
2.12 - * "License"). You may not use this file except in compliance with the
2.13 - * License. You can obtain a copy of the License at
2.14 - * http://www.netbeans.org/cddl-gplv2.html
2.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
2.16 - * specific language governing permissions and limitations under the
2.17 - * License. When distributing the software, include this License Header
2.18 - * Notice in each file and include the License file at
2.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
2.20 - * particular file as subject to the "Classpath" exception as provided
2.21 - * by Sun in the GPL Version 2 section of the License file that
2.22 - * accompanied this code. If applicable, add the following below the
2.23 - * License Header, with the fields enclosed by brackets [] replaced by
2.24 - * your own identifying information:
2.25 - * "Portions Copyrighted [year] [name of copyright owner]"
2.26 - *
2.27 - * If you wish your version of this file to be governed by only the CDDL
2.28 - * or only the GPL Version 2, indicate your decision by adding
2.29 - * "[Contributor] elects to include this software in this distribution
2.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
2.31 - * single choice of license, a recipient has the option to distribute
2.32 - * your version of this file under either the CDDL, the GPL Version 2 or
2.33 - * to extend the choice of license to its licensees as provided above.
2.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
2.35 - * Version 2 license, then the option applies only if the new code is
2.36 - * made subject to such option by the copyright holder.
2.37 - *
2.38 - * Contributor(s):
2.39 - *
2.40 - * Portions Copyrighted 2010 Sun Microsystems, Inc.
2.41 - */
2.42 -
2.43 -package org.netbeans.modules.php.smarty.editor.completion.entries;
2.44 -
2.45 -/**
2.46 - *
2.47 - * @author Martin Fousek
2.48 - */
2.49 -public class CodeCompletionItemBuiltInFunctionsAtributes {
2.50 - private String attType, attRequired, attDefault, addDescription, attName;
2.51 -
2.52 - public CodeCompletionItemBuiltInFunctionsAtributes(String attType, String attRequired, String attDefault, String addDescription, String attName) {
2.53 - this.attType = attType;
2.54 - this.attRequired = attRequired;
2.55 - this.attDefault = attDefault;
2.56 - this.addDescription = addDescription;
2.57 - this.attName = attName;
2.58 - }
2.59 -
2.60 - public String getHelp() {
2.61 - return attName;
2.62 - }
2.63 -
2.64 -}
3.1 --- a/php.smarty/src/org/netbeans/modules/php/smarty/ui/customizer/SmartyCustomizerPanel.form Tue Jun 15 15:42:30 2010 +0200
3.2 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/ui/customizer/SmartyCustomizerPanel.form Wed Jun 16 14:44:01 2010 +0200
3.3 @@ -25,16 +25,15 @@
3.4 <EmptySpace pref="94" max="32767" attributes="0"/>
3.5 <Component id="optionsLabel" min="-2" max="-2" attributes="0"/>
3.6 </Group>
3.7 - <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
3.8 - <Group type="102" alignment="0" attributes="1">
3.9 - <Component id="customCloseDelimiterLabel" min="-2" max="-2" attributes="0"/>
3.10 - <EmptySpace max="-2" attributes="0"/>
3.11 - <Component id="customCloseDelimiterTextField" max="32767" attributes="0"/>
3.12 + <Group type="102" alignment="0" attributes="0">
3.13 + <Group type="103" groupAlignment="1" attributes="0">
3.14 + <Component id="customCloseDelimiterLabel" alignment="0" min="-2" max="-2" attributes="0"/>
3.15 + <Component id="customOpenDelimiterLabel" alignment="0" min="-2" max="-2" attributes="0"/>
3.16 </Group>
3.17 - <Group type="102" alignment="0" attributes="0">
3.18 - <Component id="customOpenDelimiterLabel" min="-2" max="-2" attributes="0"/>
3.19 - <EmptySpace max="-2" attributes="0"/>
3.20 - <Component id="customOpenDelimiterTextField" min="-2" pref="100" max="-2" attributes="0"/>
3.21 + <EmptySpace type="separate" max="-2" attributes="0"/>
3.22 + <Group type="103" groupAlignment="0" attributes="0">
3.23 + <Component id="customCloseDelimiterTextField" linkSize="1" pref="100" max="32767" attributes="0"/>
3.24 + <Component id="customOpenDelimiterTextField" linkSize="1" alignment="0" min="-2" pref="100" max="-2" attributes="0"/>
3.25 </Group>
3.26 </Group>
3.27 </Group>
3.28 @@ -57,14 +56,14 @@
3.29 <Component id="customCloseDelimiterLabel" alignment="3" min="-2" max="-2" attributes="0"/>
3.30 <Component id="customCloseDelimiterTextField" alignment="3" min="-2" max="-2" attributes="0"/>
3.31 </Group>
3.32 - <EmptySpace max="-2" attributes="0"/>
3.33 + <EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
3.34 <Component id="customDelimitersLabel" min="-2" max="-2" attributes="0"/>
3.35 </Group>
3.36 <Component id="optionsLabel" min="-2" max="-2" attributes="0"/>
3.37 </Group>
3.38 <EmptySpace max="-2" attributes="0"/>
3.39 <Component id="jSeparator1" min="-2" pref="10" max="-2" attributes="0"/>
3.40 - <EmptySpace pref="187" max="32767" attributes="0"/>
3.41 + <EmptySpace pref="167" max="32767" attributes="0"/>
3.42 </Group>
3.43 </Group>
3.44 </DimensionLayout>
3.45 @@ -77,13 +76,6 @@
3.46 </Property>
3.47 </Properties>
3.48 </Component>
3.49 - <Component class="javax.swing.JLabel" name="customCloseDelimiterLabel">
3.50 - <Properties>
3.51 - <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
3.52 - <ResourceString bundle="org/netbeans/modules/php/smarty/ui/customizer/Bundle.properties" key="SmartyCustomizerPanel.customCloseDelimiterLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
3.53 - </Property>
3.54 - </Properties>
3.55 - </Component>
3.56 <Component class="javax.swing.JTextField" name="customOpenDelimiterTextField">
3.57 <Properties>
3.58 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
3.59 @@ -91,13 +83,6 @@
3.60 </Property>
3.61 </Properties>
3.62 </Component>
3.63 - <Component class="javax.swing.JTextField" name="customCloseDelimiterTextField">
3.64 - <Properties>
3.65 - <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
3.66 - <ResourceString bundle="org/netbeans/modules/php/smarty/ui/customizer/Bundle.properties" key="SmartyCustomizerPanel.customCloseDelimiterTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
3.67 - </Property>
3.68 - </Properties>
3.69 - </Component>
3.70 <Component class="javax.swing.JLabel" name="customDelimitersLabel">
3.71 <Properties>
3.72 <Property name="foreground" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
3.73 @@ -124,5 +109,19 @@
3.74 <EventHandler event="mousePressed" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="optionsLabelMousePressed"/>
3.75 </Events>
3.76 </Component>
3.77 + <Component class="javax.swing.JLabel" name="customCloseDelimiterLabel">
3.78 + <Properties>
3.79 + <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
3.80 + <ResourceString bundle="org/netbeans/modules/php/smarty/ui/customizer/Bundle.properties" key="SmartyCustomizerPanel.customCloseDelimiterLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
3.81 + </Property>
3.82 + </Properties>
3.83 + </Component>
3.84 + <Component class="javax.swing.JTextField" name="customCloseDelimiterTextField">
3.85 + <Properties>
3.86 + <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
3.87 + <ResourceString bundle="org/netbeans/modules/php/smarty/ui/customizer/Bundle.properties" key="SmartyCustomizerPanel.customCloseDelimiterTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
3.88 + </Property>
3.89 + </Properties>
3.90 + </Component>
3.91 </SubComponents>
3.92 </Form>
4.1 --- a/php.smarty/src/org/netbeans/modules/php/smarty/ui/customizer/SmartyCustomizerPanel.java Tue Jun 15 15:42:30 2010 +0200
4.2 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/ui/customizer/SmartyCustomizerPanel.java Wed Jun 16 14:44:01 2010 +0200
4.3 @@ -40,6 +40,7 @@
4.4 package org.netbeans.modules.php.smarty.ui.customizer;
4.5
4.6 import java.awt.Color;
4.7 +import java.awt.Component;
4.8 import java.awt.Cursor;
4.9 import java.awt.event.MouseAdapter;
4.10 import java.awt.event.MouseEvent;
4.11 @@ -50,6 +51,7 @@
4.12 import javax.swing.JSeparator;
4.13 import javax.swing.JTextField;
4.14 import javax.swing.LayoutStyle.ComponentPlacement;
4.15 +import javax.swing.SwingConstants;
4.16 import org.netbeans.api.options.OptionsDisplayer;
4.17 import org.netbeans.modules.php.smarty.SmartyFramework;
4.18 import org.openide.awt.Mnemonics;
4.19 @@ -77,16 +79,14 @@
4.20
4.21
4.22 customOpenDelimiterLabel = new JLabel();
4.23 - customCloseDelimiterLabel = new JLabel();
4.24 customOpenDelimiterTextField = new JTextField();
4.25 - customCloseDelimiterTextField = new JTextField();
4.26 customDelimitersLabel = new JLabel();
4.27 jSeparator1 = new JSeparator();
4.28 optionsLabel = new JLabel();
4.29 + customCloseDelimiterLabel = new JLabel();
4.30 + customCloseDelimiterTextField = new JTextField();
4.31 Mnemonics.setLocalizedText(customOpenDelimiterLabel, NbBundle.getMessage(SmartyCustomizerPanel.class, "SmartyCustomizerPanel.customOpenDelimiterLabel.text"));
4.32 - Mnemonics.setLocalizedText(customCloseDelimiterLabel, NbBundle.getMessage(SmartyCustomizerPanel.class, "SmartyCustomizerPanel.customCloseDelimiterLabel.text"));
4.33 customOpenDelimiterTextField.setText(NbBundle.getMessage(SmartyCustomizerPanel.class, "SmartyCustomizerPanel.customOpenDelimiterTextField.text")); // NOI18N
4.34 - customCloseDelimiterTextField.setText(NbBundle.getMessage(SmartyCustomizerPanel.class, "SmartyCustomizerPanel.customCloseDelimiterTextField.text")); // NOI18N
4.35 customDelimitersLabel.setForeground(new Color(124, 124, 124));
4.36 Mnemonics.setLocalizedText(customDelimitersLabel, NbBundle.getMessage(SmartyCustomizerPanel.class, "SmartyCustomizerPanel.customDelimitersLabel.text"));
4.37 Mnemonics.setLocalizedText(optionsLabel, NbBundle.getMessage(SmartyCustomizerPanel.class, "SmartyCustomizerPanel.optionsLabel.text"));
4.38 @@ -99,7 +99,8 @@
4.39 optionsLabelMousePressed(evt);
4.40 }
4.41 });
4.42 -
4.43 + Mnemonics.setLocalizedText(customCloseDelimiterLabel, NbBundle.getMessage(SmartyCustomizerPanel.class, "SmartyCustomizerPanel.customCloseDelimiterLabel.text"));
4.44 + customCloseDelimiterTextField.setText(NbBundle.getMessage(SmartyCustomizerPanel.class, "SmartyCustomizerPanel.customCloseDelimiterTextField.text")); // NOI18N
4.45 GroupLayout layout = new GroupLayout(this);
4.46 this.setLayout(layout);
4.47 layout.setHorizontalGroup(
4.48 @@ -112,17 +113,19 @@
4.49 .addComponent(customDelimitersLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
4.50 .addPreferredGap(ComponentPlacement.RELATED, 94, Short.MAX_VALUE)
4.51 .addComponent(optionsLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
4.52 - .addGroup(layout.createParallelGroup(Alignment.TRAILING, false)
4.53 - .addGroup(Alignment.LEADING, layout.createSequentialGroup()
4.54 - .addComponent(customCloseDelimiterLabel)
4.55 - .addPreferredGap(ComponentPlacement.RELATED)
4.56 - .addComponent(customCloseDelimiterTextField))
4.57 - .addGroup(Alignment.LEADING, layout.createSequentialGroup()
4.58 - .addComponent(customOpenDelimiterLabel)
4.59 - .addPreferredGap(ComponentPlacement.RELATED)
4.60 + .addGroup(layout.createSequentialGroup()
4.61 + .addGroup(layout.createParallelGroup(Alignment.TRAILING)
4.62 + .addComponent(customCloseDelimiterLabel, Alignment.LEADING)
4.63 + .addComponent(customOpenDelimiterLabel, Alignment.LEADING))
4.64 + .addGap(18, 18, 18)
4.65 + .addGroup(layout.createParallelGroup(Alignment.LEADING)
4.66 + .addComponent(customCloseDelimiterTextField, GroupLayout.DEFAULT_SIZE, 100, Short.MAX_VALUE)
4.67 .addComponent(customOpenDelimiterTextField, GroupLayout.PREFERRED_SIZE, 100, GroupLayout.PREFERRED_SIZE))))
4.68 .addContainerGap())
4.69 );
4.70 +
4.71 + layout.linkSize(SwingConstants.HORIZONTAL, new Component[] {customCloseDelimiterTextField, customOpenDelimiterTextField});
4.72 +
4.73 layout.setVerticalGroup(
4.74 layout.createParallelGroup(Alignment.LEADING)
4.75 .addGroup(layout.createSequentialGroup()
4.76 @@ -136,12 +139,12 @@
4.77 .addGroup(layout.createParallelGroup(Alignment.BASELINE)
4.78 .addComponent(customCloseDelimiterLabel)
4.79 .addComponent(customCloseDelimiterTextField, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
4.80 - .addPreferredGap(ComponentPlacement.RELATED)
4.81 + .addGap(26, 26, 26)
4.82 .addComponent(customDelimitersLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
4.83 .addComponent(optionsLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
4.84 .addPreferredGap(ComponentPlacement.RELATED)
4.85 .addComponent(jSeparator1, GroupLayout.PREFERRED_SIZE, 10, GroupLayout.PREFERRED_SIZE)
4.86 - .addContainerGap(187, Short.MAX_VALUE))
4.87 + .addContainerGap(167, Short.MAX_VALUE))
4.88 );
4.89 }// </editor-fold>//GEN-END:initComponents
4.90
5.1 --- a/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanel.form Tue Jun 15 15:42:30 2010 +0200
5.2 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanel.form Wed Jun 16 14:44:01 2010 +0200
5.3 @@ -25,16 +25,6 @@
5.4 <EmptySpace max="-2" attributes="0"/>
5.5 <Group type="103" groupAlignment="0" attributes="0">
5.6 <Component id="jSeparator1" alignment="0" pref="586" max="32767" attributes="0"/>
5.7 - <Group type="102" alignment="0" attributes="0">
5.8 - <Component id="openDelimiterLabel" min="-2" max="-2" attributes="0"/>
5.9 - <EmptySpace type="separate" max="-2" attributes="0"/>
5.10 - <Component id="openDelimiterTextField" min="-2" pref="100" max="-2" attributes="0"/>
5.11 - </Group>
5.12 - <Group type="102" alignment="0" attributes="0">
5.13 - <Component id="closeDelimiterLabel" min="-2" max="-2" attributes="0"/>
5.14 - <EmptySpace type="separate" max="-2" attributes="0"/>
5.15 - <Component id="closeDelimiterTextField" min="-2" pref="100" max="-2" attributes="0"/>
5.16 - </Group>
5.17 <Component id="errorLabel" alignment="0" min="-2" max="-2" attributes="0"/>
5.18 <Component id="learnMoreLabel" alignment="0" min="-2" max="-2" attributes="0"/>
5.19 <Component id="installationInfoLabel" alignment="0" min="-2" max="-2" attributes="0"/>
5.20 @@ -45,6 +35,18 @@
5.21 <EmptySpace max="-2" attributes="0"/>
5.22 <Component id="depthOfScanningNoteLabel" min="-2" max="-2" attributes="0"/>
5.23 </Group>
5.24 + <Group type="102" alignment="0" attributes="0">
5.25 + <Group type="103" groupAlignment="0" attributes="0">
5.26 + <Component id="closeDelimiterLabel" alignment="0" min="-2" max="-2" attributes="0"/>
5.27 + <Component id="openDelimiterLabel" alignment="0" min="-2" max="-2" attributes="0"/>
5.28 + </Group>
5.29 + <EmptySpace type="separate" max="-2" attributes="0"/>
5.30 + <Group type="103" groupAlignment="0" max="-2" attributes="0">
5.31 + <Component id="openDelimiterTextField" linkSize="1" max="32767" attributes="1"/>
5.32 + <Component id="closeDelimiterTextField" linkSize="1" alignment="0" pref="100" max="32767" attributes="1"/>
5.33 + </Group>
5.34 + <EmptySpace min="-2" pref="13" max="-2" attributes="0"/>
5.35 + </Group>
5.36 </Group>
5.37 <EmptySpace max="-2" attributes="0"/>
5.38 </Group>
5.39 @@ -97,13 +99,6 @@
5.40 </Property>
5.41 </Properties>
5.42 </Component>
5.43 - <Component class="javax.swing.JTextField" name="openDelimiterTextField">
5.44 - <Properties>
5.45 - <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
5.46 - <ResourceString bundle="org/netbeans/modules/php/smarty/ui/options/Bundle.properties" key="SmartyOptionsPanel.openDelimiterTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
5.47 - </Property>
5.48 - </Properties>
5.49 - </Component>
5.50 <Component class="javax.swing.JTextField" name="closeDelimiterTextField">
5.51 <Properties>
5.52 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
5.53 @@ -159,5 +154,12 @@
5.54 </Property>
5.55 </Properties>
5.56 </Component>
5.57 + <Component class="javax.swing.JTextField" name="openDelimiterTextField">
5.58 + <Properties>
5.59 + <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
5.60 + <ResourceString bundle="org/netbeans/modules/php/smarty/ui/options/Bundle.properties" key="SmartyOptionsPanel.openDelimiterTextField.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
5.61 + </Property>
5.62 + </Properties>
5.63 + </Component>
5.64 </SubComponents>
5.65 </Form>
6.1 --- a/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanel.java Tue Jun 15 15:42:30 2010 +0200
6.2 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/ui/options/SmartyOptionsPanel.java Wed Jun 16 14:44:01 2010 +0200
6.3 @@ -45,6 +45,7 @@
6.4
6.5 package org.netbeans.modules.php.smarty.ui.options;
6.6
6.7 +import java.awt.Component;
6.8 import java.awt.Cursor;
6.9 import java.awt.event.MouseAdapter;
6.10 import java.awt.event.MouseEvent;
6.11 @@ -58,6 +59,7 @@
6.12 import javax.swing.JSeparator;
6.13 import javax.swing.JTextField;
6.14 import javax.swing.LayoutStyle.ComponentPlacement;
6.15 +import javax.swing.SwingConstants;
6.16 import javax.swing.UIManager;
6.17 import javax.swing.event.ChangeListener;
6.18 import javax.swing.event.DocumentEvent;
6.19 @@ -175,7 +177,6 @@
6.20
6.21 openDelimiterLabel = new JLabel();
6.22 closeDelimiterLabel = new JLabel();
6.23 - openDelimiterTextField = new JTextField();
6.24 closeDelimiterTextField = new JTextField();
6.25 errorLabel = new JLabel();
6.26 learnMoreLabel = new JLabel();
6.27 @@ -184,9 +185,9 @@
6.28 depthOfScanningLabel = new JLabel();
6.29 depthOfScanningNoteLabel = new JLabel();
6.30 depthOfScanningComboBox = new JComboBox();
6.31 + openDelimiterTextField = new JTextField();
6.32 Mnemonics.setLocalizedText(openDelimiterLabel, NbBundle.getMessage(SmartyOptionsPanel.class, "SmartyOptionsPanel.openDelimiterLabel.text"));
6.33 Mnemonics.setLocalizedText(closeDelimiterLabel, NbBundle.getMessage(SmartyOptionsPanel.class, "SmartyOptionsPanel.closeDelimiterLabel.text"));
6.34 - openDelimiterTextField.setText(NbBundle.getMessage(SmartyOptionsPanel.class, "SmartyOptionsPanel.openDelimiterTextField.text")); // NOI18N
6.35 closeDelimiterTextField.setText(NbBundle.getMessage(SmartyOptionsPanel.class, "SmartyOptionsPanel.closeDelimiterTextField.text")); // NOI18N
6.36 Mnemonics.setLocalizedText(errorLabel, NbBundle.getMessage(SmartyOptionsPanel.class, "SmartyOptionsPanel.errorLabel.text"));
6.37 Mnemonics.setLocalizedText(learnMoreLabel, NbBundle.getMessage(SmartyOptionsPanel.class, "SmartyOptionsPanel.learnMoreLabel.text"));
6.38 @@ -201,6 +202,7 @@
6.39 Mnemonics.setLocalizedText(installationInfoLabel, NbBundle.getMessage(SmartyOptionsPanel.class, "SmartyOptionsPanel.installationInfoLabel.text"));
6.40 Mnemonics.setLocalizedText(depthOfScanningLabel, NbBundle.getMessage(SmartyOptionsPanel.class, "SmartyOptionsPanel.depthOfScanningLabel.text"));
6.41 Mnemonics.setLocalizedText(depthOfScanningNoteLabel, NbBundle.getMessage(SmartyOptionsPanel.class, "SmartyOptionsPanel.depthOfScanningNoteLabel.text"));
6.42 + openDelimiterTextField.setText(NbBundle.getMessage(SmartyOptionsPanel.class, "SmartyOptionsPanel.openDelimiterTextField.text")); // NOI18N
6.43 GroupLayout layout = new GroupLayout(this);
6.44 this.setLayout(layout);
6.45 layout.setHorizontalGroup(
6.46 @@ -209,14 +211,6 @@
6.47 .addContainerGap()
6.48 .addGroup(layout.createParallelGroup(Alignment.LEADING)
6.49 .addComponent(jSeparator1, GroupLayout.DEFAULT_SIZE, 586, Short.MAX_VALUE)
6.50 - .addGroup(layout.createSequentialGroup()
6.51 - .addComponent(openDelimiterLabel)
6.52 - .addGap(18, 18, 18)
6.53 - .addComponent(openDelimiterTextField, GroupLayout.PREFERRED_SIZE, 100, GroupLayout.PREFERRED_SIZE))
6.54 - .addGroup(layout.createSequentialGroup()
6.55 - .addComponent(closeDelimiterLabel)
6.56 - .addGap(18, 18, 18)
6.57 - .addComponent(closeDelimiterTextField, GroupLayout.PREFERRED_SIZE, 100, GroupLayout.PREFERRED_SIZE))
6.58 .addComponent(errorLabel)
6.59 .addComponent(learnMoreLabel, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
6.60 .addComponent(installationInfoLabel)
6.61 @@ -225,9 +219,21 @@
6.62 .addPreferredGap(ComponentPlacement.RELATED)
6.63 .addComponent(depthOfScanningComboBox, GroupLayout.PREFERRED_SIZE, 50, GroupLayout.PREFERRED_SIZE)
6.64 .addPreferredGap(ComponentPlacement.RELATED)
6.65 - .addComponent(depthOfScanningNoteLabel)))
6.66 + .addComponent(depthOfScanningNoteLabel))
6.67 + .addGroup(layout.createSequentialGroup()
6.68 + .addGroup(layout.createParallelGroup(Alignment.LEADING)
6.69 + .addComponent(closeDelimiterLabel)
6.70 + .addComponent(openDelimiterLabel))
6.71 + .addGap(18, 18, 18)
6.72 + .addGroup(layout.createParallelGroup(Alignment.LEADING, false)
6.73 + .addComponent(openDelimiterTextField)
6.74 + .addComponent(closeDelimiterTextField, GroupLayout.DEFAULT_SIZE, 100, Short.MAX_VALUE))
6.75 + .addGap(13, 13, 13)))
6.76 .addContainerGap())
6.77 );
6.78 +
6.79 + layout.linkSize(SwingConstants.HORIZONTAL, new Component[] {closeDelimiterTextField, openDelimiterTextField});
6.80 +
6.81 layout.setVerticalGroup(
6.82 layout.createParallelGroup(Alignment.LEADING)
6.83 .addGroup(layout.createSequentialGroup()