Copy Rung issue

Author: sharmapuneet1510

src/main/java/org/grandviewtech/constants/ApplicationConstant.java

@@ -35,5 +35,5 @@ public class ApplicationConstant
 		public static int			SECTION_HEIGHT				= 100;
 		public static int			MAX_CELL					= 10;
 		public static int			CUSTOM_BORDER_HEIGTH_OFFSET	= 2;
-		final public static String	VERSION						= "V 10.7";
+		final public static String	VERSION						= "V 10.8";
 	}

src/main/java/org/grandviewtech/entity/bo/ClipBoard.java

@@ -53,22 +53,22 @@ public static ClipBoard getInstance()
 				return ClipBoardInstanceFactory.instance;
 			}
 
-		private static JLabel			  selection			 = new JLabel("SELECTION : OFF ");
-		private static CLIPBOARD_ACTION	  clipboardAction	 = CLIPBOARD_ACTION.DEFUALT;
-		public static JLabel			  cutLabel;
-		public static JLabel			  copyLabel;
-		public static JLabel			  pasteLabel;
+		private static JLabel				selection			= new JLabel("SELECTION : OFF ");
+		private static CLIPBOARD_ACTION		clipboardAction		= CLIPBOARD_ACTION.DEFUALT;
+		public static JLabel				cutLabel;
+		public static JLabel				copyLabel;
+		public static JLabel				pasteLabel;
 
-		private static boolean			  isControlKeyActive = false;
+		private static boolean				isControlKeyActive	= false;
 
-		private static String			  clipBoardType;
-		private static List<Rung>		  copiedTempRung	 = new ArrayList<Rung>();
-		private static List<Rung>		  copiedRung		 = new ArrayList<Rung>();
-		private static List<ColumnScreen> tempData			 = new ArrayList<ColumnScreen>();
-		private static List<ColumnScreen> copiedCell		 = new ArrayList<ColumnScreen>();
+		private static String				clipBoardType;
+		private static List<Rung>			copiedTempRung		= new ArrayList<Rung>();
+		private static List<Rung>			copiedRung			= new ArrayList<Rung>();
+		private static List<ColumnScreen>	tempData			= new ArrayList<ColumnScreen>();
+		private static List<ColumnScreen>	copiedCell			= new ArrayList<ColumnScreen>();
 
-		private static int				  currentRowNumber;
-		private static int				  currentColumnNumber;
+		private static int					currentRowNumber;
+		private static int					currentColumnNumber;
 
 		public static String getClipBoardType()
 			{
@@ -116,21 +116,24 @@ public static void addCopiedRung()
 			{
 				for (Rung rung : copiedTempRung)
 					{
-						int rowNumber = rung.getRowNumber();
-						RowScreen rowScreen = SCREEN.getRow(rowNumber);
-						if (clipboardAction == CLIPBOARD_ACTION.COPY)
+						if (copiedRung.contains(rung) == false)
 							{
-								rowScreen.setBackground(java.awt.Color.GREEN);
+								int rowNumber = rung.getRowNumber();
+								RowScreen rowScreen = SCREEN.getRow(rowNumber);
+								if (clipboardAction == CLIPBOARD_ACTION.COPY)
+									{
+										rowScreen.setBackground(java.awt.Color.GREEN);
+									}
+								else if (clipboardAction == CLIPBOARD_ACTION.CUT)
+									{
+										rowScreen.setBackground(java.awt.Color.RED);
+									}
+								else
+									{
+										rowScreen.setBackground(java.awt.Color.RED);
+									}
+								copiedRung.add(rung);
 							}
-						else if (clipboardAction == CLIPBOARD_ACTION.CUT)
-							{
-								rowScreen.setBackground(java.awt.Color.RED);
-							}
-						else
-							{
-								rowScreen.setBackground(java.awt.Color.RED);
-							}
-						copiedRung.add(rung);
 					}
 			}
 

src/main/java/org/grandviewtech/userinterface/listeners/RungListener.java

@@ -58,12 +58,16 @@ public void mouseClicked(MouseEvent mouseEvent)
 						editMenu.removeAll();
 						open();
 						editMenu.show(rung, rung.getX() + 22, rung.getY());
+						//
 					}
-				ClipBoard.addTempRung(rung);
+					
 				if (ClipBoard.isControlKeyActive() == false)
 					{
 						rung.setBackground(Color.GREEN);
 					}
+					
+				ClipBoard.addTempRung(rung);
+				
 			}
 
 		@Override