Browse Source

Small bugfixing in frame.java

Max Nuding 12 years ago
parent
commit
39f750439d
1 changed files with 72 additions and 14 deletions
  1. 72
    14
      Cube Control/frame.java

+ 72
- 14
Cube Control/frame.java View File

@@ -507,35 +507,83 @@ public class frame extends JFrame implements ListSelectionListener {
507 507
   // Anfang Ereignisprozeduren
508 508
   public void editA_ActionPerformed(ActionEvent evt) {
509 509
 
510
-     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 0, worker);
510
+     if(animList.getSelectedIndex() == -1){
511
+       errorMessage("Please select an animation.");
512
+     } else if(frameList.getSelectedIndex() == -1){
513
+       errorMessage("Please select a frame.");
514
+     } else {
515
+       layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 0, worker);
516
+     }
511 517
   }
512 518
 
513 519
   public void editB_ActionPerformed(ActionEvent evt) {
514
-     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 1, worker);
520
+    if(animList.getSelectedIndex() == -1){
521
+       errorMessage("Please select an animation.");
522
+     } else if(frameList.getSelectedIndex() == -1){
523
+       errorMessage("Please select a frame.");
524
+     } else {
525
+       layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 1, worker);
526
+     }
515 527
   }
516 528
 
517 529
   public void editC_ActionPerformed(ActionEvent evt) {
518
-     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 2, worker);
530
+    if(animList.getSelectedIndex() == -1){
531
+       errorMessage("Please select an animation.");
532
+     } else if(frameList.getSelectedIndex() == -1){
533
+       errorMessage("Please select a frame.");
534
+     } else {
535
+       layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 2, worker);
536
+     }
519 537
   }
520 538
 
521 539
   public void editD_ActionPerformed(ActionEvent evt) {
522
-     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 3, worker);
540
+    if(animList.getSelectedIndex() == -1){
541
+       errorMessage("Please select an animation.");
542
+     } else if(frameList.getSelectedIndex() == -1){
543
+       errorMessage("Please select a frame.");
544
+     } else {
545
+       layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 3, worker);
546
+     }
523 547
   }
524 548
 
525 549
   public void editE_ActionPerformed(ActionEvent evt) {
526
-     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 4, worker);
550
+     if(animList.getSelectedIndex() == -1){
551
+       errorMessage("Please select an animation.");
552
+     } else if(frameList.getSelectedIndex() == -1){
553
+       errorMessage("Please select a frame.");
554
+     } else {
555
+       layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 4, worker);
556
+     }
527 557
   }
528 558
 
529 559
   public void editF_ActionPerformed(ActionEvent evt) {
530
-     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 5, worker);
560
+     if(animList.getSelectedIndex() == -1){
561
+       errorMessage("Please select an animation.");
562
+     } else if(frameList.getSelectedIndex() == -1){
563
+       errorMessage("Please select a frame.");
564
+     } else {
565
+       layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 5, worker);
566
+     }
531 567
   }
532 568
 
533 569
   public void editG_ActionPerformed(ActionEvent evt) {
534
-     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 6, worker);
570
+     if(animList.getSelectedIndex() == -1){
571
+       errorMessage("Please select an animation.");
572
+     } else if(frameList.getSelectedIndex() == -1){
573
+       errorMessage("Please select a frame.");
574
+     } else {
575
+       layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 6, worker);
576
+     }
535 577
   }
536 578
 
537 579
   public void editH_ActionPerformed(ActionEvent evt) {
538
-     layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 7, worker);
580
+     if(animList.getSelectedIndex() == -1){
581
+       errorMessage("Please select an animation.");
582
+     } else if(frameList.getSelectedIndex() == -1){
583
+       errorMessage("Please select a frame.");
584
+     } else {
585
+       layerEditFrame layerFrame1 = new layerEditFrame(animList.getSelectedIndex(), frameList.getSelectedIndex(), 7, worker);
586
+     }
539 587
   }
540 588
 
541 589
   public void frameUp_ActionPerformed(ActionEvent evt) {
@@ -577,10 +625,16 @@ public class frame extends JFrame implements ListSelectionListener {
577 625
   }
578 626
 
579 627
   public void frameRemove_ActionPerformed(ActionEvent evt) {
580
-         worker.removeFrame(animList.getSelectedIndex(), frameList.getSelectedIndex());
581
-         frameRemaining.setText(Integer.toString(worker.framesRemaining()));
582
-     frameListModel.removeElementAt(frameList.getSelectedIndex());
583
-     frameList.setModel(frameListModel);
628
+     if(animList.getSelectedIndex() == -1){
629
+       errorMessage("Select an animation.");
630
+     } else if(frameList.getSelectedIndex() == -1){
631
+       errorMessage("Select a frame.");
632
+     } else {
633
+       worker.removeFrame(animList.getSelectedIndex(), frameList.getSelectedIndex());
634
+       frameRemaining.setText(Integer.toString(worker.framesRemaining()));
635
+       frameListModel.removeElementAt(frameList.getSelectedIndex());
636
+       frameList.setModel(frameListModel);
637
+     }
584 638
   }
585 639
 
586 640
   public void animUp_ActionPerformed(ActionEvent evt) {
@@ -624,9 +678,13 @@ n = 0;
624 678
   }
625 679
 
626 680
   public void animRemove_ActionPerformed(ActionEvent evt) {
681
+   if(animList.getSelectedIndex() == -1){
682
+     errorMessage("Select an animation.");
683
+   } else {
627 684
      worker.removeAnimation(animList.getSelectedIndex());
628
-   animModel.removeElementAt(animList.getSelectedIndex());
629
-   animList.setModel(animModel);
685
+     animModel.removeElementAt(animList.getSelectedIndex());
686
+     animList.setModel(animModel);
687
+   }
630 688
   }
631 689
 
632 690
   public void load_ActionPerformed(ActionEvent evt) {

Loading…
Cancel
Save