Browse Source

Fixes #57, Fixes #108 - Upgrading an existing installation should be possible now. Also the warnings should disappear when doing a clean install. In theory during the installation one should be prompted whether one wants to add a desktop shortcut for blender

MeFisto94 7 years ago
parent
commit
03f6556803

+ 1 - 1
nbi/stub/ext/components/products/blender/src/org/mycompany/wizard.xml

@@ -39,5 +39,5 @@
 -->
 
 <wizard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="wizard-components.xsd">
-    <!--component class="org.mycompany.wizard.panels.ShortcutCreationPanel"/-->
+    <component class="org.mycompany.wizard.panels.ShortcutCreationPanel"/>
 </wizard>

+ 4 - 2
nbi/stub/ext/components/products/jdk/src/org/mycompany/ConfigurationLogic.java

@@ -1,6 +1,7 @@
 package org.mycompany;
 
 import java.util.List;
+import java.util.ArrayList;
 import org.netbeans.installer.product.components.ProductConfigurationLogic;
 import org.netbeans.installer.utils.exceptions.InitializationException;
 import org.netbeans.installer.utils.exceptions.InstallationException;
@@ -17,9 +18,10 @@ public class ConfigurationLogic extends ProductConfigurationLogic {
 
     // constructor //////////////////////////////////////////////////////////////////
     public ConfigurationLogic() throws InitializationException {
-        wizardComponents = Wizard.loadWizardComponents(
+        /*wizardComponents = Wizard.loadWizardComponents(
                 WIZARD_COMPONENTS_URI,
-                getClass().getClassLoader());
+                getClass().getClassLoader());*/
+        wizardComponents = new ArrayList<>();
     }
 
     public List<WizardComponent> getWizardComponents() {

+ 0 - 42
nbi/stub/ext/components/products/jdk/src/org/mycompany/wizard.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-  Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
-
-  Oracle and Java are registered trademarks of Oracle and/or its affiliates.
-  Other names may be trademarks of their respective owners.
-
-  The contents of this file are subject to the terms of either the GNU General Public
-  License Version 2 only ("GPL") or the Common Development and Distribution
-  License("CDDL") (collectively, the "License"). You may not use this file except in
-  compliance with the License. You can obtain a copy of the License at
-  http://www.netbeans.org/cddl-gplv2.html or nbbuild/licenses/CDDL-GPL-2-CP. See the
-  License for the specific language governing permissions and limitations under the
-  License.  When distributing the software, include this License Header Notice in
-  each file and include the License file at nbbuild/licenses/CDDL-GPL-2-CP.  Oracle
-  designates this particular file as subject to the "Classpath" exception as provided
-  by Oracle in the GPL Version 2 section of the License file that accompanied this code.
-  If applicable, add the following below the License Header, with the fields enclosed
-  by brackets [] replaced by your own identifying information:
-  "Portions Copyrighted [year] [name of copyright owner]"
-  
-  Contributor(s):
-  
-  The Original Software is NetBeans. The Initial Developer of the Original Software
-  is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun Microsystems, Inc. All
-  Rights Reserved.
-  
-  If you wish your version of this file to be governed by only the CDDL or only the
-  GPL Version 2, indicate your decision by adding "[Contributor] elects to include
-  this software in this distribution under the [CDDL or GPL Version 2] license." If
-  you do not indicate a single choice of license, a recipient has the option to
-  distribute your version of this file under either the CDDL, the GPL Version 2 or
-  to extend the choice of license to its licensees as provided above. However, if you
-  add GPL Version 2 code and therefore, elected the GPL Version 2 license, then the
-  option applies only if the new code is made subject to such option by the copyright
-  holder.
--->
-
-<wizard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="wizard-components.xsd">
-</wizard>