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 2020/05/17 08:15:29 UTC
[GitHub] [netbeans] jlahoda opened a new pull request #2143: Adding the OpenJDK support with ability to disable use of ant langtoo…
jlahoda opened a new pull request #2143:
URL: https://github.com/apache/netbeans/pull/2143
…ls build; and specifying a different location for the build.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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
---------------------------------------------------------------------
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
[GitHub] [netbeans] arvindaprameya commented on pull request #2143: Adding the OpenJDK support with ability to disable use of ant langtoo…
Posted by GitBox <gi...@apache.org>.
arvindaprameya commented on pull request #2143:
URL: https://github.com/apache/netbeans/pull/2143#issuecomment-631230456
+1 approved, Thanks for adding this Jan. Please consider this for 12.0 if that's possible
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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
---------------------------------------------------------------------
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
[GitHub] [netbeans] sdedic commented on a change in pull request #2143: Adding the OpenJDK support with ability to disable use of ant langtoo…
Posted by GitBox <gi...@apache.org>.
sdedic commented on a change in pull request #2143:
URL: https://github.com/apache/netbeans/pull/2143#discussion_r427765277
##########
File path: java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/ActionProviderImpl.java
##########
@@ -409,12 +409,15 @@ private static boolean newStyleXPatch(FileObject testFile) {
static String builtClassesDirsForBootClassPath(FileObject testFile) {
File buildDir = BuildUtils.getBuildTargetDir(testFile);
Project prj = FileOwnerQuery.getOwner(testFile);
+ Settings settings = prj.getLookup().lookup(Settings.class);
+ boolean useLangtoolsBuild = settings == null || settings.isUseAntBuild();
List<FileObject> roots = new ArrayList<>();
if (buildDir != null) {
FileObject repo = prj.getProjectDirectory().getParent().getParent();
if (repo.getNameExt().equals("langtools") &&
- ShortcutUtils.getDefault().shouldUseCustomTest(repo.getNameExt(), FileUtil.getRelativePath(repo, testFile))) {
+ ShortcutUtils.getDefault().shouldUseCustomTest(repo.getNameExt(), FileUtil.getRelativePath(repo, testFile)) &&
Review comment:
Nitpick: maybe a small helper `shouldUseLangtoolsBuild(String repoName, FileObject testFile)` could help to unify this settings lookup + condition: 2 occurrences. Consider when chaning the conditions next time :)
##########
File path: java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/ActionProviderImpl.java
##########
@@ -171,8 +171,14 @@ public void invokeAction(String command, Lookup context) throws IllegalArgumentE
}
}
FileObject scriptFO = script;
+ Settings settings = project.getLookup().lookup(Settings.class);
+ Properties props = new Properties();
+ if (settings.isUseAntBuild()) {
Review comment:
The other `ActionProviderImpl` checks `settings != null` before dereferencing. But a direct dereference was already there in `COMMAND_BUILD_GENERIC_FAST` branch.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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
---------------------------------------------------------------------
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
[GitHub] [netbeans] jlahoda commented on a change in pull request #2143: Adding the OpenJDK support with ability to disable use of ant langtoo…
Posted by GitBox <gi...@apache.org>.
jlahoda commented on a change in pull request #2143:
URL: https://github.com/apache/netbeans/pull/2143#discussion_r428143864
##########
File path: java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/project/customizer/BuildCategory.java
##########
@@ -0,0 +1,132 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.netbeans.modules.java.openjdk.project.customizer;
+
+import javax.swing.JComponent;
+import org.netbeans.modules.java.openjdk.project.JDKProject;
+import org.netbeans.modules.java.openjdk.project.Settings;
+import org.netbeans.spi.project.ui.support.ProjectCustomizer;
+import org.openide.util.Lookup;
+
+/**
+ *
+ * @author lahvac
+ */
+public class BuildCategory extends javax.swing.JPanel {
+
+ /**
+ * Creates new form BuildCategory
+ */
+ public BuildCategory(boolean useAntBuild, String antBuildLocation) {
+ initComponents();
+ this.useAntBuild.setSelected(useAntBuild);
+ this.antBuildLocation.setText(antBuildLocation);
+ updateEnableDisable();
+ }
+
+ private void updateEnableDisable() {
+ antBuildLocationLabel.setEnabled(useAntBuild.isSelected());
+ antBuildLocation.setEnabled(useAntBuild.isSelected());
+ }
+ /**
+ * This method is called from within the constructor to initialize the form.
+ * WARNING: Do NOT modify this code. The content of this method is always
+ * regenerated by the Form Editor.
+ */
+ @SuppressWarnings("unchecked")
+ // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+ private void initComponents() {
+
+ useAntBuild = new javax.swing.JCheckBox();
+ antBuildLocationLabel = new javax.swing.JLabel();
+ antBuildLocation = new javax.swing.JTextField();
+
+ org.openide.awt.Mnemonics.setLocalizedText(useAntBuild, org.openide.util.NbBundle.getMessage(BuildCategory.class, "BuildCategory.useAntBuild.text")); // NOI18N
+ useAntBuild.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ useAntBuildActionPerformed(evt);
+ }
+ });
+
+ org.openide.awt.Mnemonics.setLocalizedText(antBuildLocationLabel, org.openide.util.NbBundle.getMessage(BuildCategory.class, "BuildCategory.antBuildLocationLabel.text")); // NOI18N
+
+ antBuildLocation.setText(org.openide.util.NbBundle.getMessage(BuildCategory.class, "BuildCategory.antBuildLocation.text")); // NOI18N
+
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+ this.setLayout(layout);
+ layout.setHorizontalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGap(21, 21, 21)
+ .addComponent(antBuildLocationLabel)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(antBuildLocation))
+ .addComponent(useAntBuild, javax.swing.GroupLayout.DEFAULT_SIZE, 380, Short.MAX_VALUE))
+ .addContainerGap())
+ );
+ layout.setVerticalGroup(
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(useAntBuild)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(antBuildLocationLabel)
+ .addComponent(antBuildLocation, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addContainerGap(244, Short.MAX_VALUE))
+ );
+ }// </editor-fold>//GEN-END:initComponents
+
+ private void useAntBuildActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_useAntBuildActionPerformed
+ updateEnableDisable();
+ }//GEN-LAST:event_useAntBuildActionPerformed
+
+
+ // Variables declaration - do not modify//GEN-BEGIN:variables
+ private javax.swing.JTextField antBuildLocation;
+ private javax.swing.JLabel antBuildLocationLabel;
+ private javax.swing.JCheckBox useAntBuild;
+ // End of variables declaration//GEN-END:variables
+
+ @ProjectCustomizer.CompositeCategoryProvider.Registration(projectType=JDKProject.PROJECT_KEY, position=100)
+ public static ProjectCustomizer.CompositeCategoryProvider createCategoryProvider() {
+ return new ProjectCustomizer.CompositeCategoryProvider() {
+ @Override
+ public ProjectCustomizer.Category createCategory(Lookup context) {
+ if (context.lookup(Settings.class) != null)
+ return ProjectCustomizer.Category.create("build", "Build", null);
+ return null;
+ }
+ @Override
+ public JComponent createComponent(ProjectCustomizer.Category category, Lookup context) {
+ Settings settings = context.lookup(Settings.class);
+ BuildCategory panel = new BuildCategory(settings.isUseAntBuild(), settings.getAntBuildLocation());
+ category.setOkButtonListener(evt -> {
+ settings.setUseAntBuild(panel.useAntBuild.isSelected());
+ settings.setJTregLocation(panel.antBuildLocation.getText());
Review comment:
Should use setAntBuildLocation.
```suggestion
settings.setAntBuildLocation(panel.antBuildLocation.getText());
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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
---------------------------------------------------------------------
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
[GitHub] [netbeans] jlahoda merged pull request #2143: Adding the OpenJDK support with ability to disable use of ant langtoo…
Posted by GitBox <gi...@apache.org>.
jlahoda merged pull request #2143:
URL: https://github.com/apache/netbeans/pull/2143
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to 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
---------------------------------------------------------------------
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