This is an automated email from the ASF dual-hosted git repository.
tmysik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 2f71bb9 [NETBEANS-5678] Use the URL of the forked repository of the
Skeleton Generator
new 32c7498 Merge pull request #3052 from
junichi11/netbeans-5678-phpunit-skel-gen
2f71bb9 is described below
commit 2f71bb9cbc2e065360a210d7ef32caa98a0278e9
Author: Junichi Yamamoto <[email protected]>
AuthorDate: Wed Jul 14 16:07:09 2021 +0900
[NETBEANS-5678] Use the URL of the forked repository of the Skeleton
Generator
https://issues.apache.org/jira/browse/NETBEANS-5678
- The original project has been abandoned
---
.../php/phpunit/ui/options/Bundle.properties | 3 ++-
.../phpunit/ui/options/PhpUnitOptionsPanel.form | 28 +++++++++++++++++-----
.../phpunit/ui/options/PhpUnitOptionsPanel.java | 28 +++++++++++++++-------
3 files changed, 43 insertions(+), 16 deletions(-)
diff --git
a/php/php.phpunit/src/org/netbeans/modules/php/phpunit/ui/options/Bundle.properties
b/php/php.phpunit/src/org/netbeans/modules/php/phpunit/ui/options/Bundle.properties
index dcc3a5e..18c395a 100644
---
a/php/php.phpunit/src/org/netbeans/modules/php/phpunit/ui/options/Bundle.properties
+++
b/php/php.phpunit/src/org/netbeans/modules/php/phpunit/ui/options/Bundle.properties
@@ -59,6 +59,7 @@
PhpUnitOptionsPanel.phpUnitInfoLabel.AccessibleContext.accessibleName=PHPUnit cl
PhpUnitOptionsPanel.noteLabel.AccessibleContext.accessibleName=Note:
PhpUnitOptionsPanel.skelGenLabel.text=&Skeleton Generator Script:
PhpUnitOptionsPanel.phpUnitLearnMoreLabel.text=<html><a href="#">Learn more
about PHPUnit</a></html>
-PhpUnitOptionsPanel.skelGenLearnMoreLabel.text=<html><a href="#">Learn more
about Skeleton Generator</a></html>
+PhpUnitOptionsPanel.skelGenLearnMoreLabel.text=<html><a href="#">Learn more
about Skeleton Generator</a> (forked repo.)</html>
PhpUnitOptionsPanel.skelGenBrowseButton.text=&Browse...
PhpUnitOptionsPanel.skelGenSearchButton.text=S&earch...
+PhpUnitOptionsPanel.skelGenAbandonedLabel.text=<html><b>The original project
has been abandoned.</b></html>
diff --git
a/php/php.phpunit/src/org/netbeans/modules/php/phpunit/ui/options/PhpUnitOptionsPanel.form
b/php/php.phpunit/src/org/netbeans/modules/php/phpunit/ui/options/PhpUnitOptionsPanel.form
index 9d2147e..22a03bc 100644
---
a/php/php.phpunit/src/org/netbeans/modules/php/phpunit/ui/options/PhpUnitOptionsPanel.form
+++
b/php/php.phpunit/src/org/netbeans/modules/php/phpunit/ui/options/PhpUnitOptionsPanel.form
@@ -53,10 +53,6 @@
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
- <Component id="skelGenHintLabel" min="-2" max="-2"
attributes="0"/>
- <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
- </Group>
- <Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="skelGenTextField" alignment="1"
max="32767" attributes="0"/>
<Component id="phpUnitTextField" alignment="1"
max="32767" attributes="0"/>
@@ -75,7 +71,13 @@
</Group>
</Group>
</Group>
- <Component id="phpUnitHintLabel" max="-2" attributes="0"/>
+ <Group type="102" attributes="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="skelGenHintLabel" min="-2" max="-2"
attributes="0"/>
+ <Component id="phpUnitHintLabel" max="-2"
attributes="0"/>
+ </Group>
+ <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+ </Group>
</Group>
</Group>
<Group type="102" attributes="0">
@@ -96,6 +98,11 @@
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
+ <Group type="102" alignment="0" attributes="0">
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="skelGenAbandonedLabel" min="-2" max="-2"
attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
+ </Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
@@ -126,7 +133,9 @@
<Component id="phpUnitPhp53InfoLabel" min="-2" max="-2"
attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="phpUnit370InfoLabel" min="-2" max="-2"
attributes="0"/>
- <EmptySpace type="separate" max="-2" attributes="0"/>
+ <EmptySpace max="-2" attributes="0"/>
+ <Component id="skelGenAbandonedLabel" min="-2" max="-2"
attributes="0"/>
+ <EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
<Component id="installationInfoLabel" min="-2" max="-2"
attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="phpUnitLearnMoreLabel" min="-2" max="-2"
attributes="0"/>
@@ -306,6 +315,13 @@
</Property>
</Properties>
</Component>
+ <Component class="javax.swing.JLabel" name="skelGenAbandonedLabel">
+ <Properties>
+ <Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString
bundle="org/netbeans/modules/php/phpunit/ui/options/Bundle.properties"
key="PhpUnitOptionsPanel.skelGenAbandonedLabel.text"
replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class,
"{key}")"/>
+ </Property>
+ </Properties>
+ </Component>
<Component class="javax.swing.JLabel" name="installationInfoLabel">
<Properties>
<Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
diff --git
a/php/php.phpunit/src/org/netbeans/modules/php/phpunit/ui/options/PhpUnitOptionsPanel.java
b/php/php.phpunit/src/org/netbeans/modules/php/phpunit/ui/options/PhpUnitOptionsPanel.java
index 69e004a..65644db 100644
---
a/php/php.phpunit/src/org/netbeans/modules/php/phpunit/ui/options/PhpUnitOptionsPanel.java
+++
b/php/php.phpunit/src/org/netbeans/modules/php/phpunit/ui/options/PhpUnitOptionsPanel.java
@@ -158,6 +158,7 @@ public class PhpUnitOptionsPanel extends JPanel {
phpUnitInfoLabel = new JLabel();
phpUnitPhp53InfoLabel = new JLabel();
phpUnit370InfoLabel = new JLabel();
+ skelGenAbandonedLabel = new JLabel();
installationInfoLabel = new JLabel();
phpUnitLearnMoreLabel = new JLabel();
skelGenLearnMoreLabel = new JLabel();
@@ -209,6 +210,8 @@ public class PhpUnitOptionsPanel extends JPanel {
Mnemonics.setLocalizedText(phpUnit370InfoLabel,
NbBundle.getMessage(PhpUnitOptionsPanel.class,
"PhpUnitOptionsPanel.phpUnit370InfoLabel.text")); // NOI18N
+ Mnemonics.setLocalizedText(skelGenAbandonedLabel,
NbBundle.getMessage(PhpUnitOptionsPanel.class,
"PhpUnitOptionsPanel.skelGenAbandonedLabel.text")); // NOI18N
+
Mnemonics.setLocalizedText(installationInfoLabel,
NbBundle.getMessage(PhpUnitOptionsPanel.class,
"PhpUnitOptionsPanel.installationInfoLabel.text")); // NOI18N
Mnemonics.setLocalizedText(phpUnitLearnMoreLabel,
NbBundle.getMessage(PhpUnitOptionsPanel.class,
"PhpUnitOptionsPanel.phpUnitLearnMoreLabel.text")); // NOI18N
@@ -235,8 +238,7 @@ public class PhpUnitOptionsPanel extends JPanel {
GroupLayout layout = new GroupLayout(this);
this.setLayout(layout);
- layout.setHorizontalGroup(
- layout.createParallelGroup(Alignment.LEADING)
+ layout.setHorizontalGroup(layout.createParallelGroup(Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(Alignment.LEADING)
.addComponent(phpUnitLabel)
@@ -244,9 +246,6 @@ public class PhpUnitOptionsPanel extends JPanel {
.addPreferredGap(ComponentPlacement.RELATED)
.addGroup(layout.createParallelGroup(Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
- .addComponent(skelGenHintLabel)
- .addGap(0, 0, Short.MAX_VALUE))
- .addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(Alignment.LEADING)
.addComponent(skelGenTextField, Alignment.TRAILING)
.addComponent(phpUnitTextField,
Alignment.TRAILING))
@@ -260,7 +259,11 @@ public class PhpUnitOptionsPanel extends JPanel {
.addComponent(skelGenBrowseButton)
.addPreferredGap(ComponentPlacement.RELATED)
.addComponent(skelGenSearchButton))))
- .addComponent(phpUnitHintLabel)))
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(Alignment.LEADING)
+ .addComponent(skelGenHintLabel)
+ .addComponent(phpUnitHintLabel))
+ .addGap(0, 0, Short.MAX_VALUE))))
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(Alignment.LEADING)
.addComponent(errorLabel)
@@ -275,12 +278,15 @@ public class PhpUnitOptionsPanel extends JPanel {
.addComponent(skelGenLearnMoreLabel,
GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
GroupLayout.PREFERRED_SIZE)
.addComponent(phpUnit370InfoLabel))))
.addGap(0, 0, Short.MAX_VALUE))
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(skelGenAbandonedLabel,
GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
layout.linkSize(SwingConstants.HORIZONTAL, new Component[]
{phpUnitBrowseButton, phpUnitSearchButton, skelGenBrowseButton,
skelGenSearchButton});
- layout.setVerticalGroup(
- layout.createParallelGroup(Alignment.LEADING)
+ layout.setVerticalGroup(layout.createParallelGroup(Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(Alignment.BASELINE)
.addComponent(phpUnitLabel)
@@ -305,6 +311,8 @@ public class PhpUnitOptionsPanel extends JPanel {
.addComponent(phpUnitPhp53InfoLabel)
.addGap(18, 18, 18)
.addComponent(phpUnit370InfoLabel)
+ .addPreferredGap(ComponentPlacement.RELATED)
+ .addComponent(skelGenAbandonedLabel,
GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE,
GroupLayout.PREFERRED_SIZE)
.addGap(18, 18, 18)
.addComponent(installationInfoLabel)
.addPreferredGap(ComponentPlacement.RELATED)
@@ -412,7 +420,8 @@ public class PhpUnitOptionsPanel extends JPanel {
private void skelGenLearnMoreLabelMousePressed(MouseEvent evt)
{//GEN-FIRST:event_skelGenLearnMoreLabelMousePressed
try {
- URL url = new
URL("https://github.com/sebastianbergmann/phpunit-skeleton-generator";); //
NOI18N
+ // the original skeleton
generator(https://github.com/sebastianbergmann/phpunit-skeleton-generator) has
been abandoned
+ URL url = new
URL("https://github.com/VitexSoftware/phpunit-skeleton-generator";); // NOI18N
HtmlBrowser.URLDisplayer.getDefault().showURL(url);
} catch (MalformedURLException ex) {
Exceptions.printStackTrace(ex);
@@ -479,6 +488,7 @@ public class PhpUnitOptionsPanel extends JPanel {
private JLabel phpUnitPhp53InfoLabel;
private JButton phpUnitSearchButton;
private JTextField phpUnitTextField;
+ private JLabel skelGenAbandonedLabel;
private JButton skelGenBrowseButton;
private JLabel skelGenHintLabel;
private JLabel skelGenLabel;
---------------------------------------------------------------------
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
