#252306 Use platform defined in nb-configuration instead of the default one
authorJulien Enselme <jenselme@netbeans.org>
Wed, 08 Jul 2015 17:38:02 +0200
changeset 1829428142955865a
parent 18293 811289685a83
child 18295 0bf82b105206
child 18296 ab5c0f763eb0
#252306 Use platform defined in nb-configuration instead of the default one

If no platform is defined, the default one is used without any notification to the user
python.project2/src/org/netbeans/modules/python/project2/PythonProject2.java
python.project2/src/org/netbeans/modules/python/project2/ui/actions/Command.java
     1.1 --- a/python.project2/src/org/netbeans/modules/python/project2/PythonProject2.java	Fri Jul 17 22:21:56 2015 +0200
     1.2 +++ b/python.project2/src/org/netbeans/modules/python/project2/PythonProject2.java	Wed Jul 08 17:38:02 2015 +0200
     1.3 @@ -127,7 +127,7 @@
     1.4      }
     1.5  
     1.6      public PythonPlatform getActivePlatform() {
     1.7 -        String pid = getProp(ProjectUtils.getAuxiliaryConfiguration(this), PythonProject2.APPLICATION_ARGS);
     1.8 +        String pid = getProp(ProjectUtils.getAuxiliaryConfiguration(this), PythonProject2.ACTIVE_PLATFORM);
     1.9          final PythonPlatformManager manager = PythonPlatformManager.getInstance();
    1.10  
    1.11          return manager.getPlatform(pid);
     2.1 --- a/python.project2/src/org/netbeans/modules/python/project2/ui/actions/Command.java	Fri Jul 17 22:21:56 2015 +0200
     2.2 +++ b/python.project2/src/org/netbeans/modules/python/project2/ui/actions/Command.java	Wed Jul 08 17:38:02 2015 +0200
     2.3 @@ -64,17 +64,7 @@
     2.4       * @param errMessage
     2.5       */
     2.6      protected PythonPlatform checkProjectPythonPlatform(PythonProject2 pyProject) {
     2.7 -//       PythonPlatform platform = PythonProject2Util.getActivePlatform(pyProject);
     2.8 -//       if ( platform == null ) {
     2.9 -//         // Better to inform the user than try to use a default unsuited
    2.10 -//         String platformId = pyProject.getEvaluator().getProperty(PythonProject2Properties.ACTIVE_PLATFORM);
    2.11 -//         showLaunchError( "selected project has broken python platform : " +
    2.12 -//                           platformId +
    2.13 -//                           " => bind to an existing python platform in project's properties "
    2.14 -//                         );
    2.15 -//       }
    2.16 -        PythonPlatform platform = PythonPlatformManager.getInstance().getPlatforms().get(0);
    2.17 -        return platform;
    2.18 +        return pyProject.getActivePlatform();
    2.19      }
    2.20  
    2.21      /**