Commit 6baf0fbb authored by Christian Mohrbacher's avatar Christian Mohrbacher

Merge branch 'v6-obsolete-raid10-621' into 'v6'

admon_gui: remove obsolete RAID10 setting from stripe setting

See merge request !211
parents 7fa69391 fbb0d374
......@@ -6,6 +6,5 @@ public enum StripePatternEnum
{
STRIPE_PATTERN_INVALID,
STRIPE_PATTERN_RAID_0,
STRIPE_PATTERN_RAID_10,
STRIPE_PATTERN_BUDDY_MIRROR
}
......@@ -308,7 +308,7 @@
<Component class="javax.swing.JComboBox" name="jComboStripingStripePattern">
<Properties>
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="new javax.swing.DefaultComboBoxModel&lt;&gt;(new String[] { &quot;RAID 0&quot;, &quot;RAID 10&quot;, &quot;BuddyMirror&quot; })" type="code"/>
<Connection code="new javax.swing.DefaultComboBoxModel&lt;&gt;(new String[] { &quot;RAID 0&quot;, &quot;BuddyMirror&quot; })" type="code"/>
</Property>
</Properties>
<AuxValues>
......
......@@ -368,7 +368,7 @@ public class JInternalFrameStriping extends javax.swing.JInternalFrame
gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5);
jPanelStriping.add(jLabelStripingStripePattern, gridBagConstraints);
jComboStripingStripePattern.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "RAID 0", "RAID 10", "BuddyMirror" }));
jComboStripingStripePattern.setModel(new javax.swing.DefaultComboBoxModel<>(new String[] { "RAID 0", "BuddyMirror" }));
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 1;
gridBagConstraints.gridy = 3;
......@@ -538,12 +538,6 @@ public class JInternalFrameStriping extends javax.swing.JInternalFrame
JOptionPane.showMessageDialog(this, msg, "Error", JOptionPane.ERROR_MESSAGE);
}
else
if(pattern == StripePatternEnum.STRIPE_PATTERN_RAID_10.ordinal() )
{
String msg = "The strippe pattern RAID10 is not supported anymore!";
JOptionPane.showMessageDialog(this, msg, "Error", JOptionPane.ERROR_MESSAGE);
}
else
{
// get a nonce for authentication from server
XMLParser parser = new XMLParser(HttpTk.generateAdmonUrl("/XML_GetNonce"), THREAD_NAME);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment