Improving multistep infrastructure, command for uploading cloud asset…

…s to config map
apache · Jul 9, 2024 · 35578f5 · 35578f5
1 parent b52e02c
commit 35578f5
Show file tree

Hide file tree

Showing 46 changed files with 2,504 additions and 1,210 deletions.
diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCINode.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/OCINode.java
@@ -19,11 +19,11 @@
 package org.netbeans.modules.cloud.oracle;
 
 import com.oracle.bmc.auth.BasicAuthenticationDetailsProvider;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
 import java.util.List;
 import javax.swing.Action;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import org.netbeans.modules.cloud.oracle.items.OCIItem;
 import org.openide.nodes.AbstractNode;
 import org.openide.nodes.Children;
@@ -121,10 +121,14 @@ public Node.Handle getHandle() {
         return super.getHandle();
     }
 
-    private final class RefreshListener implements ChangeListener {
+    private final class RefreshListener implements PropertyChangeListener {
         @Override
-        public void stateChanged(ChangeEvent e) {
-            refresh();
+        public void propertyChange(PropertyChangeEvent evt) {
+            if ("referenceName".equals(evt.getPropertyName())) {
+                fireDisplayNameChange("", getDisplayName());
+            } else {
+                refresh();
+            }
         }
     }
 

diff --git a/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/AddADBAction.java b/enterprise/cloud.oracle/src/org/netbeans/modules/cloud/oracle/actions/AddADBAction.java
@@ -75,14 +75,16 @@
 @NbBundle.Messages({
     "AddADB=Add Oracle Autonomous DB",
     "SelectProfile=Select OCI Profile",
-    "# {0} - tenancy name",
-    "# {1} - region id",
-    "SelectProfile_Description={0} (region: {1})",
     "SelectCompartment=Select Compartment",
     "SelectDatabase=Select Database",
     "NoDatabase=No Database available in this Compartment",
     "EnterUsername=Enter Username",
-    "EnterPassword=Enter Password"
+    "EnterPassword=Enter Password",
+    "MSG_CollectingProfiles=Searching for OCI Profiles",
+    "MSG_CollectingProfiles_Text=Loading OCI Profiles",
+    "MSG_CollectingItems=Loading OCI contents",
+    "MSG_CollectingItems_Text=Listing compartments and databases",
+    "SelectProfile_Description={0} (region: {1})"
 })
 public class AddADBAction implements ActionListener {
     private static final Logger LOGGER = Logger.getLogger(AddADBAction.class.getName());
@@ -92,12 +94,6 @@ public class AddADBAction implements ActionListener {
     private static final String PASSWORD = "password"; //NOI18N
     private static final int NUMBER_OF_INPUTS = 4;
 
-    @NbBundle.Messages({
-        "MSG_CollectingProfiles=Searching for OCI Profiles",
-        "MSG_CollectingProfiles_Text=Loading OCI Profiles",
-        "MSG_CollectingItems=Loading OCI contents",
-        "MSG_CollectingItems_Text=Listing compartments and databases",
-    })
     @Override
     public void actionPerformed(ActionEvent e) {
         addADB();
@@ -212,8 +208,7 @@ public NotifyDescriptor createInput(NotifyDescriptor.ComposedInput input, int nu
                         AbstractPasswordPanel.generatePassword(),
                         (String) result.get(USERNAME),
                         ((String) result.get(PASSWORD)).toCharArray(),
-                        selectedDatabase.getKey().getValue(),
-                        selectedDatabase.getCompartmentId());
+                        selectedDatabase);
                 action.addConnection(info);
                 return selectedDatabase;
             } catch (IOException ex) {