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/29 05:08:42 UTC
[GitHub] lkishalmi closed pull request #992: [NETBEANS-1342] Hide the panel
for iOS in the Mobile Platforms Options
lkishalmi closed pull request #992: [NETBEANS-1342] Hide the panel for iOS in the Mobile Platforms Options
URL: https://github.com/apache/incubator-netbeans/pull/992
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/webcommon/cordova/src/org/netbeans/modules/cordova/CordovaPerformer.java b/webcommon/cordova/src/org/netbeans/modules/cordova/CordovaPerformer.java
index cd976f3ce9..132a7f8d0d 100644
--- a/webcommon/cordova/src/org/netbeans/modules/cordova/CordovaPerformer.java
+++ b/webcommon/cordova/src/org/netbeans/modules/cordova/CordovaPerformer.java
@@ -171,6 +171,7 @@ private ExecutorTask perform(final String target, final Project project, final b
if (provider != null &&
"ios_1".equals(provider.getActiveBrowser().getId()) &&
(target.equals(BuildPerformer.RUN_IOS) || target.equals(BuildPerformer.BUILD_IOS)) &&
+ PlatformManager.getPlatform(PlatformManager.IOS_TYPE) != null &&
PlatformManager.getPlatform(PlatformManager.IOS_TYPE).getProvisioningProfilePath() == null
) {
throw new IllegalStateException(Bundle.ERR_NO_Provisioning());
@@ -324,15 +325,16 @@ private Properties properties(Project p) {
props.put(PROP_ANDROID_PROJECT_ACTIVITY, activity);//NOI18N
MobilePlatform iosPlatform = PlatformManager.getPlatform(PlatformManager.IOS_TYPE);
+ if (iosPlatform != null) {
+ final String provisioningProfilePath = iosPlatform.getProvisioningProfilePath();
+ if (provisioningProfilePath != null) {
+ props.put(PROP_PROVISIONING_PROFILE, provisioningProfilePath);
+ }
+ final String codeSignIdentity = iosPlatform.getCodeSignIdentity();
- final String provisioningProfilePath = iosPlatform.getProvisioningProfilePath();
- if (provisioningProfilePath != null) {
- props.put(PROP_PROVISIONING_PROFILE, provisioningProfilePath);
- }
- final String codeSignIdentity = iosPlatform.getCodeSignIdentity();
-
- if (codeSignIdentity != null) {
- props.put(PROP_CERTIFICATE_NAME, codeSignIdentity);
+ if (codeSignIdentity != null) {
+ props.put(PROP_CERTIFICATE_NAME, codeSignIdentity);
+ }
}
//workaround for some strange behavior of ant execution in netbeans
@@ -349,7 +351,7 @@ private Properties properties(Project p) {
props.put(PROP_CONFIG, mobileConfig.getId());
mobileConfig.getDevice().addProperties(props);
- if (mobileConfig.getId().equals("ios")) { // NOI18N
+ if (mobileConfig.getId().equals("ios") && iosPlatform != null) { // NOI18N
boolean sdkVerified = false;
try {
for (SDK sdk:iosPlatform.getSDKs()) {
diff --git a/webcommon/cordova/src/org/netbeans/modules/cordova/options/MobilePlatformsPanel.java b/webcommon/cordova/src/org/netbeans/modules/cordova/options/MobilePlatformsPanel.java
index 6f23352d29..66b586d047 100644
--- a/webcommon/cordova/src/org/netbeans/modules/cordova/options/MobilePlatformsPanel.java
+++ b/webcommon/cordova/src/org/netbeans/modules/cordova/options/MobilePlatformsPanel.java
@@ -24,6 +24,7 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collection;
+import java.util.Collections;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JLabel;
import javax.swing.SwingUtilities;
@@ -49,7 +50,7 @@
private final MobilePlatformsOptionsPanelController controller;
private DocumentListener documentL;
private String codeSignIdentity;
- private Collection<? extends ProvisioningProfile> provisioningProfiles;
+ private Collection<? extends ProvisioningProfile> provisioningProfiles = Collections.emptyList();
private String provisioningProfilePath;
private boolean inited = false;
private RequestProcessor.Task versionTask;
@@ -273,9 +274,11 @@ private void cordovaVersionBrowseActionPerformed(java.awt.event.ActionEvent evt)
void load() {
final MobilePlatform iosPlatform = PlatformManager.getPlatform(PlatformManager.IOS_TYPE);
- codeSignIdentity = iosPlatform.getCodeSignIdentity();
- provisioningProfiles = iosPlatform.getProvisioningProfiles();
- provisioningProfilePath = iosPlatform.getProvisioningProfilePath();
+ if (iosPlatform != null) {
+ codeSignIdentity = iosPlatform.getCodeSignIdentity();
+ provisioningProfiles = iosPlatform.getProvisioningProfiles();
+ provisioningProfilePath = iosPlatform.getProvisioningProfilePath();
+ }
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
@@ -309,8 +312,12 @@ public void run() {
void setupComponenets() {
if (!inited) {
removeAll();
- initComponents();
-
+ initComponents();
+ MobilePlatform iosPlatform = PlatformManager.getPlatform(PlatformManager.IOS_TYPE);
+ if (iosPlatform == null) {
+ iOSPanel.setVisible(false);
+ }
+
cordovaPathField.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
diff --git a/webcommon/cordova/src/org/netbeans/modules/cordova/project/CordovaPanel.java b/webcommon/cordova/src/org/netbeans/modules/cordova/project/CordovaPanel.java
index 4eab67520d..2053510cda 100644
--- a/webcommon/cordova/src/org/netbeans/modules/cordova/project/CordovaPanel.java
+++ b/webcommon/cordova/src/org/netbeans/modules/cordova/project/CordovaPanel.java
@@ -22,6 +22,8 @@
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
import org.netbeans.modules.cordova.CordovaPerformer;
+import org.netbeans.modules.cordova.platforms.api.PlatformManager;
+import org.netbeans.modules.cordova.platforms.spi.MobilePlatform;
import org.netbeans.modules.cordova.updatetask.SourceConfig;
import org.netbeans.modules.cordova.wizard.CordovaTemplate;
import org.openide.util.NbBundle;
@@ -71,6 +73,10 @@ private void fireChange() {
public CordovaPanel() {
this(null);
platformsPane.setVisible(true);
+ MobilePlatform iosPlatform = PlatformManager.getPlatform(PlatformManager.IOS_TYPE);
+ if (iosPlatform == null) {
+ iOSPanel.setVisible(false);
+ }
}
public void setControlsEnabled(boolean enabled) {
diff --git a/webcommon/cordova/src/org/netbeans/modules/cordova/wizard/CordovaProjectExtender.java b/webcommon/cordova/src/org/netbeans/modules/cordova/wizard/CordovaProjectExtender.java
index 2087a91cb1..c520f7b658 100644
--- a/webcommon/cordova/src/org/netbeans/modules/cordova/wizard/CordovaProjectExtender.java
+++ b/webcommon/cordova/src/org/netbeans/modules/cordova/wizard/CordovaProjectExtender.java
@@ -22,6 +22,7 @@
import org.netbeans.modules.cordova.platforms.spi.Device;
import java.io.File;
import java.io.IOException;
+import org.netbeans.modules.cordova.platforms.spi.MobilePlatform;
import org.netbeans.modules.cordova.project.ConfigUtils;
import org.netbeans.modules.web.clientproject.api.ClientSideModule;
import org.netbeans.modules.web.clientproject.spi.ClientProjectExtender;
@@ -67,7 +68,8 @@ public static void createMobileConfigs(FileObject projectRoot) throws IOExceptio
ios.put(ConfigUtils.DISPLAY_NAME_PROP, Bundle.LBL_iPhoneSimulator());
ios.put(Device.TYPE_PROP, PlatformManager.IOS_TYPE);
ios.put(Device.DEVICE_PROP, Device.EMULATOR);
- ios.put("ios.build.sdk", PlatformManager.getPlatform(PlatformManager.IOS_TYPE).getPrefferedTarget().getIdentifier()); // NOI18N
+ MobilePlatform iosPlatform = PlatformManager.getPlatform(PlatformManager.IOS_TYPE);
+ ios.put("ios.build.sdk", iosPlatform == null ? "" : iosPlatform.getPrefferedTarget().getIdentifier()); // NOI18N
ios.put("ios.build.arch", "i386"); // NOI18N
ConfigUtils.createConfigFile(projectRoot, PlatformManager.IOS_TYPE, ios);//NOI18N
@@ -82,7 +84,8 @@ public static void createMobileConfigs(FileObject projectRoot) throws IOExceptio
iosdev.put(ConfigUtils.DISPLAY_NAME_PROP, Bundle.LBL_iPhoneDevice());
iosdev.put(Device.TYPE_PROP, PlatformManager.IOS_TYPE);
iosdev.put(Device.DEVICE_PROP, Device.DEVICE);
- String sim = PlatformManager.getPlatform(PlatformManager.IOS_TYPE).getPrefferedTarget().getIdentifier();
+ MobilePlatform iosPlatform = PlatformManager.getPlatform(PlatformManager.IOS_TYPE);
+ String sim = iosPlatform == null ? "" : iosPlatform.getPrefferedTarget().getIdentifier();
iosdev.put("ios.build.sdk", sim.replace("iphonesimulator", "iphoneos")); // NOI18N
iosdev.put("ios.build.arch", sim.startsWith("iphonesimulator6")?"armv6 armv7":"armv7 armv7s"); // NOI18N
diff --git a/webcommon/cordova/test/unit/src/org/netbeans/modules/web/clientproject/cordova/AndroidPlatformTest.java b/webcommon/cordova/test/unit/src/org/netbeans/modules/web/clientproject/cordova/AndroidPlatformTest.java
index 039c886009..a3609839b7 100644
--- a/webcommon/cordova/test/unit/src/org/netbeans/modules/web/clientproject/cordova/AndroidPlatformTest.java
+++ b/webcommon/cordova/test/unit/src/org/netbeans/modules/web/clientproject/cordova/AndroidPlatformTest.java
@@ -180,8 +180,10 @@ private int getPid() throws IOException {
@Test
public void testListSdks() throws Exception {
MobilePlatform instance = org.netbeans.modules.cordova.platforms.api.PlatformManager.getPlatform(PlatformManager.IOS_TYPE);
- for (SDK sdks: instance.getSDKs()) {
- System.out.println(sdks);
+ if (instance != null) {
+ for (SDK sdks : instance.getSDKs()) {
+ System.out.println(sdks);
+ }
}
}
----------------------------------------------------------------
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