You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@netbeans.apache.org by GitBox <gi...@apache.org> on 2018/10/05 06:58:39 UTC
[GitHub] tmysik closed pull request #947: [NETBEANS-1350] Fix "PHP 5" text
tmysik closed pull request #947: [NETBEANS-1350] Fix "PHP 5" text
URL: https://github.com/apache/incubator-netbeans/pull/947
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.project/src/org/netbeans/modules/php/project/ui/options/Bundle.properties b/php/php.project/src/org/netbeans/modules/php/project/ui/options/Bundle.properties
index 5d45720401..87f00fe2bd 100644
--- a/php/php.project/src/org/netbeans/modules/php/project/ui/options/Bundle.properties
+++ b/php/php.project/src/org/netbeans/modules/php/project/ui/options/Bundle.properties
@@ -55,7 +55,7 @@ PhpOptionsPanel.moveDownButton.AccessibleContext.accessibleName=Move Down
PhpOptionsPanel.addFolderButton.AccessibleContext.accessibleName=Add Folder
PhpOptionsPanel.removeButton.AccessibleContext.accessibleName=Remove
PhpOptionsPanel.useTheFollowingPathByDefaultLabel.AccessibleContext.accessibleName=Use the Following Path by Default
-PhpOptionsPanel.phpInterpreterLabel.AccessibleContext.accessibleName=PHP 5 Interpreter
+PhpOptionsPanel.phpInterpreterLabel.AccessibleContext.accessibleName=PHP Interpreter
PhpOptionsPanel.commandLineLabel.AccessibleContext.accessibleName=Command Line
PhpOptionsPanel.searchButton.AccessibleContext.accessibleName=Search
PhpOptionsPanel.browseButton.AccessibleContext.accessibleName=Browse
diff --git a/php/php.project/src/org/netbeans/modules/php/project/ui/options/PhpOptionsPanel.java b/php/php.project/src/org/netbeans/modules/php/project/ui/options/PhpOptionsPanel.java
index 7ae887e2aa..1b2debba2e 100644
--- a/php/php.project/src/org/netbeans/modules/php/project/ui/options/PhpOptionsPanel.java
+++ b/php/php.project/src/org/netbeans/modules/php/project/ui/options/PhpOptionsPanel.java
@@ -198,7 +198,7 @@ private void initComponents() {
globalIncludePathLabel = new JLabel();
useTheFollowingPathByDefaultLabel = new JLabel();
includePathScrollPane = new JScrollPane();
- includePathList = new JList<BasePathSupport.Item>();
+ includePathList = new JList<>();
addFolderButton = new JButton();
removeButton = new JButton();
moveUpButton = new JButton();
@@ -259,8 +259,7 @@ public void actionPerformed(ActionEvent evt) {
GroupLayout layout = new GroupLayout(this);
this.setLayout(layout);
- layout.setHorizontalGroup(
- layout.createParallelGroup(Alignment.LEADING)
+ layout.setHorizontalGroup(layout.createParallelGroup(Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addComponent(commandLineLabel)
.addPreferredGap(ComponentPlacement.RELATED)
@@ -312,8 +311,7 @@ public void actionPerformed(ActionEvent evt) {
layout.linkSize(SwingConstants.HORIZONTAL, new Component[] {phpInterpreterBrowseButton, phpInterpreterSearchButton});
- layout.setVerticalGroup(
- layout.createParallelGroup(Alignment.LEADING)
+ layout.setVerticalGroup(layout.createParallelGroup(Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(Alignment.TRAILING)
.addComponent(commandLineLabel)
diff --git a/php/php.project/src/org/netbeans/modules/php/project/ui/resources/emptyPhpProject.html b/php/php.project/src/org/netbeans/modules/php/project/ui/resources/emptyPhpProject.html
index 4b7f9d395e..166ecb0e85 100644
--- a/php/php.project/src/org/netbeans/modules/php/project/ui/resources/emptyPhpProject.html
+++ b/php/php.project/src/org/netbeans/modules/php/project/ui/resources/emptyPhpProject.html
@@ -23,7 +23,7 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
</head>
<body>
- <b>Creates a new PHP 5 application</b> in a standard IDE project.
+ <b>Creates a new PHP application</b> in a standard IDE project.
Such project can be easily run and debugged.
</body>
</html>
diff --git a/php/php.project/src/org/netbeans/modules/php/project/ui/resources/existingPhpProject.html b/php/php.project/src/org/netbeans/modules/php/project/ui/resources/existingPhpProject.html
index 29deee1e91..1467dc5b92 100644
--- a/php/php.project/src/org/netbeans/modules/php/project/ui/resources/existingPhpProject.html
+++ b/php/php.project/src/org/netbeans/modules/php/project/ui/resources/existingPhpProject.html
@@ -23,7 +23,7 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
</head>
<body>
- <b>Imports an existing PHP 5 application</b> into a standard IDE project.
+ <b>Imports an existing PHP application</b> into a standard IDE project.
Such project can be easily run and debugged.
</body>
</html>
diff --git a/php/php.project/src/org/netbeans/modules/php/project/ui/resources/remotePhpProject.html b/php/php.project/src/org/netbeans/modules/php/project/ui/resources/remotePhpProject.html
index 6c36a70a77..d0f4f81155 100644
--- a/php/php.project/src/org/netbeans/modules/php/project/ui/resources/remotePhpProject.html
+++ b/php/php.project/src/org/netbeans/modules/php/project/ui/resources/remotePhpProject.html
@@ -23,7 +23,7 @@
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
</head>
<body>
- <b>Downloads an existing PHP 5 application</b>, creates a standard IDE project for it
+ <b>Downloads an existing PHP application</b>, creates a standard IDE project for it
and sets up the project properties accordingly (<b>automatic uploading of local changes to the server</b>).
Such project can be easily run and debugged.
</body>
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists