tmysik closed pull request #972: [NETBEANS-1443] Error creating Symfony project
URL: https://github.com/apache/incubator-netbeans/pull/972
 
 
   

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/php/php.symfony2/src/org/netbeans/modules/php/symfony2/SymfonyPhpModuleExtender.java
 
b/php/php.symfony2/src/org/netbeans/modules/php/symfony2/SymfonyPhpModuleExtender.java
index 332d5ec0dd..f9a15c3cac 100644
--- 
a/php/php.symfony2/src/org/netbeans/modules/php/symfony2/SymfonyPhpModuleExtender.java
+++ 
b/php/php.symfony2/src/org/netbeans/modules/php/symfony2/SymfonyPhpModuleExtender.java
@@ -98,7 +98,8 @@ public String getWarningMessage() {
             // use installer
             final InstallerExecutable installer = 
InstallerExecutable.getDefault(phpModule, false);
             assert installer != null;
-            Future<Integer> task = installer.run(getPanel().isUseLts());
+            // [NETBEANS-1443] always use LTS
+            Future<Integer> task = installer.run(true);
             try {
                 task.get(30, TimeUnit.MINUTES);
             } catch (InterruptedException ex) {
diff --git 
a/php/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/wizards/Bundle.properties
 
b/php/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/wizards/Bundle.properties
index 981335d2d4..8f6a4f37a4 100644
--- 
a/php/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/wizards/Bundle.properties
+++ 
b/php/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/wizards/Bundle.properties
@@ -16,5 +16,4 @@
 # under the License.
 
 NewProjectConfigurationPanel.optionsLabel.text=<html><a 
href="#">Options...</a></html>
-NewProjectConfigurationPanel.ltsCheckBox.text=&Use LTS version
 NewProjectConfigurationPanel.noteLabel.text=<html><i>Note:</i> Installation 
takes a long time.
diff --git 
a/php/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/wizards/NewProjectConfigurationPanel.form
 
b/php/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/wizards/NewProjectConfigurationPanel.form
index 0751956a52..9929436d79 100644
--- 
a/php/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/wizards/NewProjectConfigurationPanel.form
+++ 
b/php/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/wizards/NewProjectConfigurationPanel.form
@@ -42,11 +42,6 @@
               <EmptySpace max="32767" attributes="0"/>
               <Component id="optionsLabel" min="-2" max="-2" attributes="0"/>
           </Group>
-          <Group type="102" alignment="0" attributes="0">
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="ltsCheckBox" min="-2" max="-2" attributes="0"/>
-              <EmptySpace max="32767" attributes="0"/>
-          </Group>
           <Group type="102" alignment="0" attributes="0">
               <Component id="noteLabel" min="-2" max="-2" attributes="0"/>
               <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
@@ -60,9 +55,7 @@
                   <Component id="optionsLabel" alignment="3" min="-2" max="-2" 
attributes="0"/>
                   <Component id="infoLabel" alignment="3" min="-2" max="-2" 
attributes="0"/>
               </Group>
-              <EmptySpace max="-2" attributes="0"/>
-              <Component id="ltsCheckBox" min="-2" max="-2" attributes="0"/>
-              <EmptySpace type="separate" max="-2" attributes="0"/>
+              <EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
               <Component id="noteLabel" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="32767" attributes="0"/>
           </Group>
@@ -86,13 +79,6 @@
         <EventHandler event="mousePressed" 
listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" 
handler="optionsLabelMousePressed"/>
       </Events>
     </Component>
-    <Component class="javax.swing.JCheckBox" name="ltsCheckBox">
-      <Properties>
-        <Property name="text" type="java.lang.String" 
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-          <ResourceString 
bundle="org/netbeans/modules/php/symfony2/ui/wizards/Bundle.properties" 
key="NewProjectConfigurationPanel.ltsCheckBox.text" 
replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, 
&quot;{key}&quot;)"/>
-        </Property>
-      </Properties>
-    </Component>
     <Component class="javax.swing.JLabel" name="noteLabel">
       <Properties>
         <Property name="text" type="java.lang.String" 
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
diff --git 
a/php/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/wizards/NewProjectConfigurationPanel.java
 
b/php/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/wizards/NewProjectConfigurationPanel.java
index 5656219c23..e6b073b33a 100644
--- 
a/php/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/wizards/NewProjectConfigurationPanel.java
+++ 
b/php/php.symfony2/src/org/netbeans/modules/php/symfony2/ui/wizards/NewProjectConfigurationPanel.java
@@ -77,10 +77,6 @@ public void removeChangeListener(ChangeListener listener) {
         changeSupport.removeChangeListener(listener);
     }
 
-    public boolean isUseLts() {
-        return ltsCheckBox.isSelected();
-    }
-
     public String getErrorMessage() {
         // treat all as errors here
         ValidationResult result = new SymfonyOptionsValidator()
@@ -127,7 +123,6 @@ private void setComponents() {
             showOther = false;
         }
         infoLabel.setText(info);
-        ltsCheckBox.setVisible(showOther);
         noteLabel.setVisible(showOther);
     }
 
@@ -149,7 +144,6 @@ private void initComponents() {
 
         infoLabel = new JLabel();
         optionsLabel = new JLabel();
-        ltsCheckBox = new JCheckBox();
         noteLabel = new JLabel();
 
         Mnemonics.setLocalizedText(infoLabel, "INFO"); // NOI18N
@@ -164,8 +158,6 @@ public void mousePressed(MouseEvent evt) {
             }
         });
 
-        Mnemonics.setLocalizedText(ltsCheckBox, 
NbBundle.getMessage(NewProjectConfigurationPanel.class, 
"NewProjectConfigurationPanel.ltsCheckBox.text")); // NOI18N
-
         Mnemonics.setLocalizedText(noteLabel, 
NbBundle.getMessage(NewProjectConfigurationPanel.class, 
"NewProjectConfigurationPanel.noteLabel.text")); // NOI18N
 
         GroupLayout layout = new GroupLayout(this);
@@ -175,10 +167,6 @@ public void mousePressed(MouseEvent evt) {
                 .addComponent(infoLabel)
                 .addPreferredGap(ComponentPlacement.RELATED, 
GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                 .addComponent(optionsLabel, GroupLayout.PREFERRED_SIZE, 
GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE))
-            .addGroup(layout.createSequentialGroup()
-                .addContainerGap()
-                .addComponent(ltsCheckBox)
-                .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
             .addGroup(layout.createSequentialGroup()
                 .addComponent(noteLabel, GroupLayout.PREFERRED_SIZE, 
GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                 .addGap(0, 0, Short.MAX_VALUE))
@@ -188,9 +176,7 @@ public void mousePressed(MouseEvent evt) {
                 .addGroup(layout.createParallelGroup(Alignment.BASELINE)
                     .addComponent(optionsLabel, GroupLayout.PREFERRED_SIZE, 
GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                     .addComponent(infoLabel))
-                .addPreferredGap(ComponentPlacement.RELATED)
-                .addComponent(ltsCheckBox)
-                .addGap(18, 18, 18)
+                .addPreferredGap(ComponentPlacement.UNRELATED)
                 .addComponent(noteLabel, GroupLayout.PREFERRED_SIZE, 
GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE)
                 .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
@@ -206,7 +192,6 @@ private void optionsLabelMousePressed(MouseEvent evt) 
{//GEN-FIRST:event_options
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private JLabel infoLabel;
-    private JCheckBox ltsCheckBox;
     private JLabel noteLabel;
     private JLabel optionsLabel;
     // End of variables declaration//GEN-END:variables


 

----------------------------------------------------------------
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

Reply via email to