添加Override注解

designer_form/src/com/fr/design/designer/creator/DedicateLayoutContainer.java

@@ -28,6 +28,7 @@ public abstract class DedicateLayoutContainer extends XLayoutContainer {
      * @return 属性名
      * @throws IntrospectionException
      */
+    @Override
     public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
         return new CRPropertyDescriptor[0];
     }
@@ -61,6 +62,7 @@ public abstract class DedicateLayoutContainer extends XLayoutContainer {
      *
      * @param name 名称
      */
+    @Override
     public void resetCreatorName(String name) {
         super.resetCreatorName(name);
         XCreator child = getXCreator(XWScaleLayout.INDEX);
@@ -72,6 +74,7 @@ public abstract class DedicateLayoutContainer extends XLayoutContainer {
      * 重置组件的可见性
      * @param visible 可见性
      */
+    @Override
     public void resetVisible(boolean visible){
         super.resetVisible(visible);
         XCreator child = getXCreator(XWScaleLayout.INDEX);
@@ -82,6 +85,7 @@ public abstract class DedicateLayoutContainer extends XLayoutContainer {
      *
      * @return 组件
      */
+    @Override
     public XCreator getPropertyDescriptorCreator() {
         return getXCreator(XWScaleLayout.INDEX);
     }
@@ -91,6 +95,7 @@ public abstract class DedicateLayoutContainer extends XLayoutContainer {
      *
      * @return 是则返回true
      */
+    @Override
     public boolean isComponentTreeLeaf() {
         return true;
     }
@@ -100,6 +105,7 @@ public abstract class DedicateLayoutContainer extends XLayoutContainer {
      *
      * @return 是则返回true
      */
+    @Override
     public boolean isDedicateContainer() {
         return true;
     }

designer_form/src/com/fr/design/designer/creator/XCreator.java

@@ -271,6 +271,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	 *@param formEditor 设计界面组件
 	 *@return 工具界面
 	 */
+	@Override
 	public JComponent createToolPane(BaseJForm jform, FormDesigner formEditor) {
 		if (!BaseUtils.isAuthorityEditing()) {
 			if (isDedicateContainer()) {
@@ -379,6 +380,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	 * 获取其在控件树上可见父层
 	 * @return 组件
 	 */
+	@Override
 	public Component getParentShow(){
 		return this.getParent();
 	}
@@ -387,6 +389,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	 * 重置组件的名称
 	 * @param name 名称
 	 */
+	@Override
 	public void resetCreatorName(String name) {
 		toData().setWidgetName(name);
 	}
@@ -403,6 +406,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	 * 返回编辑的子组件，scale为其内部组件
 	 * @return 组件
 	 */
+	@Override
 	public XCreator getEditingChildCreator() {
 		return this;
 	}
@@ -411,6 +415,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	 * 返回对应属性表的组件，scale和title返回其子组件
 	 * @return 组件
 	 */
+	@Override
 	public XCreator getPropertyDescriptorCreator() {
 		return this;
 	}
@@ -419,6 +424,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	 * 更新子组件的Bound; 没有不处理
 	 * @param minHeight 最小高度
 	 */
+	@Override
 	public void updateChildBound(int minHeight) {
 		return;
 	}
@@ -427,6 +433,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	 * 是否作为控件树的叶子节点
 	 * @return 是则返回true
 	 */
+	@Override
 	public boolean isComponentTreeLeaf() {
 		return true;
 	}
@@ -435,6 +442,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	 *  是否为sclae和title专属容器
 	 * @return 是则返回true
 	 */
+	@Override
 	public boolean isDedicateContainer() {
 		return false;
 	}

designer_form/src/com/fr/design/designer/creator/cardlayout/XCardSwitchButton.java

@@ -153,6 +153,7 @@ public class XCardSwitchButton extends XButton {
 	 *            点击事件
 	 * 
 	 */
+	@Override
 	public void respondClick(EditingMouseListener editingMouseListener,
 							 MouseEvent e) {
 		FormDesigner designer = editingMouseListener.getDesigner();
@@ -310,6 +311,7 @@ public class XCardSwitchButton extends XButton {
 		}
 	}
 	
+    @Override
 	public void paintComponent(Graphics g) {
         super.paintComponent(g);
         Graphics2D g2d = (Graphics2D) g;
@@ -432,6 +434,7 @@ public class XCardSwitchButton extends XButton {
 		label = this.getContentLabel();
 	}
 
+	@Override
 	public void firePropertyChange() {
 		super.firePropertyChange();
 		tagLayout.setTabsAndAdjust();

designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardLayout.java

@@ -81,6 +81,7 @@ public class XWCardLayout extends XLayoutContainer {
 	 * @date 2014-11-25-下午6:22:40
 	 * 
 	 */
+	@Override
 	public String createDefaultName() {
     	return "cardlayout";
     }
@@ -94,6 +95,7 @@ public class XWCardLayout extends XLayoutContainer {
 	 * @date 2014-11-25-下午6:22:17
 	 * 
 	 */
+    @Override
 	public WCardLayout toData() {
         return (WCardLayout) data;
     }
@@ -102,6 +104,7 @@ public class XWCardLayout extends XLayoutContainer {
 	 *  初始化时默认的组件大小
 	 * @return   默认Dimension
 	 */
+	@Override
 	public Dimension initEditorSize() {
 		return new Dimension(500, 300);
 	}
@@ -155,6 +158,7 @@ public class XWCardLayout extends XLayoutContainer {
 	 * @date 2014-11-25-下午4:47:23
 	 * 
 	 */
+	@Override
 	protected XLayoutContainer getCreatorWrapper(String widgetName) {
 		initStyle();
 		Dimension dimension = new Dimension();
@@ -248,6 +252,7 @@ public class XWCardLayout extends XLayoutContainer {
 	 * @date 2014-11-27-上午9:47:00
 	 *
 	 */
+	@Override
 	protected void setWrapperName(XLayoutContainer parentPanel, String widgetName) {
 		parentPanel.toData().setWidgetName("tablayout" + widgetName.replaceAll(createDefaultName(),""));
 	}
@@ -261,6 +266,7 @@ public class XWCardLayout extends XLayoutContainer {
 	 * @date 2014-11-25-下午4:57:55
 	 * 
 	 */
+	@Override
 	protected void addToWrapper(XLayoutContainer parentPanel, int width, int minHeight){
 		parentPanel.add(this, WBorderLayout.CENTER);
 	}
@@ -274,6 +280,7 @@ public class XWCardLayout extends XLayoutContainer {
 	 * @date 2014-11-25-下午6:20:10
 	 * 
 	 */
+    @Override
 	public void componentAdded(ContainerEvent e) {
         if (isRefreshing) {
             return;
@@ -299,6 +306,7 @@ public class XWCardLayout extends XLayoutContainer {
 	 * 是否支持标题样式
 	 * @return 默认false
 	 */
+	@Override
 	public boolean hasTitleStyle() {
 		return true;
 	}
@@ -308,6 +316,7 @@ public class XWCardLayout extends XLayoutContainer {
 	 * @return 属性名
 	 * @throws IntrospectionException
 	 */
+	@Override
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
 		//嵌套的tab组件，内层的不支持轮播属性，屏蔽属性表
 		if(!isNested()) {
@@ -394,6 +403,7 @@ public class XWCardLayout extends XLayoutContainer {
 	}
 	
 	//初始化样式
+    @Override
 	protected void initStyle() {
     	LayoutBorderStyle style = toData().getBorderStyle();
     	initBorderTitleStyle(style);
@@ -447,7 +457,8 @@ public class XWCardLayout extends XLayoutContainer {
      * @param designer 表单设计器
      * 
      */
-	public void deleteRelatedComponent(XCreator creator,FormDesigner designer){
+	@Override
+	public void deleteRelatedComponent(XCreator creator, FormDesigner designer){
 		XWCardMainBorderLayout mainLayout = (XWCardMainBorderLayout) creator.getBackupParent();
 		SelectionModel selectionModel = designer.getSelectionModel();
 		selectionModel.setSelectedCreator(mainLayout);
@@ -476,6 +487,7 @@ public class XWCardLayout extends XLayoutContainer {
 	 * data属性改变触发其他操作
 	 *
 	 */
+	@Override
 	public void firePropertyChange(){
 		initStyle();
 	}

designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java

@@ -68,6 +68,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout{
 	 * @date 2014-12-10-下午1:46:33
 	 *
 	 */
+	@Override
 	public WCardMainBorderLayout toData() {
 		return (WCardMainBorderLayout) super.toData();
 	}
@@ -104,6 +105,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout{
 	 *
 	 * @return designer 表单设计器
 	 */
+	@Override
 	public void stopAddingState(FormDesigner designer){
 		designer.stopAddingState();
 		return;
@@ -177,6 +179,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout{
      * 重新调整子组件的宽度
      * @param width 宽度
      */
+    @Override
 	public void recalculateChildWidth(int width){
 		ArrayList<?> childrenList = this.getTargetChildrenList();
 		int size = childrenList.size();
@@ -208,6 +211,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout{
      * 重新调整子组件的高度
      * @param height 高度
      */
+    @Override
 	public void recalculateChildHeight(int height){
 		ArrayList<?> childrenList = this.getTargetChildrenList();
 		int size = childrenList.size();
@@ -240,6 +244,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout{
 
     }
 
+	@Override
 	public void paint(Graphics g) {
 		super.paint(g);
 		//如果鼠标移动到布局内且布局不可编辑，画出编辑蒙层
@@ -282,7 +287,8 @@ public class XWCardMainBorderLayout extends XWBorderLayout{
 	 * @param editingMouseListener 鼠标点击，位置处理器
 	 * @param e 鼠标点击事件
 	 */
-	public void respondClick(EditingMouseListener editingMouseListener,MouseEvent e){
+	@Override
+	public void respondClick(EditingMouseListener editingMouseListener, MouseEvent e){
 		FormDesigner designer = editingMouseListener.getDesigner();
 		SelectionModel selectionModel = editingMouseListener.getSelectionModel();
 		boolean isEditing = e.getButton() == MouseEvent.BUTTON1 &&
@@ -325,6 +331,7 @@ public class XWCardMainBorderLayout extends XWBorderLayout{
 	 * data属性改变触发其他操作
 	 *
 	 */
+	@Override
 	public void firePropertyChange(){
 		getCardPart().initStyle();
 	}

designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTagLayout.java

@@ -117,6 +117,7 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
      * @param e 事件
      * @date 2014-11-25-下午6:20:10
      */
+    @Override
     public void componentAdded(ContainerEvent e) {
         super.componentAdded(e);
 
@@ -151,6 +152,7 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
     /**
      * 将WLayout转换为XLayoutContainer
      */
+    @Override
     public void convert() {
         isRefreshing = true;
         WCardTagLayout layout = (WCardTagLayout) this.toData();
@@ -167,6 +169,7 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
         isRefreshing = false;
     }
 
+    @Override
     public String createDefaultName() {
         return "tabpane";
     }
@@ -176,6 +179,7 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
      *
      * @return designer 表单设计器
      */
+    @Override
     public void stopAddingState(FormDesigner designer) {
         designer.stopAddingState();
     }
@@ -210,6 +214,7 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
      *
      * @param
      */
+    @Override
     public void setBorder(Border border) {
 
     }
@@ -237,10 +242,12 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
         }
     }
 
+    @Override
     public int[] getDirections() {
         return ((XCreator)getParent()).getDirections();
     }
 
+    @Override
     public Rectangle getBounds() {
         return this.getParent().getBounds();
     }
@@ -305,6 +312,7 @@ public class XWCardTagLayout extends XWHorizontalBoxLayout {
      * data属性改变触发其他操作
      *
      */
+    @Override
     public void firePropertyChange() {
         WCardTagLayout wCardTagLayout = (WCardTagLayout) this.toData();
         ((XWCardMainBorderLayout) getTopLayout()).resetTabDisplayPosition(wCardTagLayout.getDisplayPosition());

designer_form/src/com/fr/design/designer/creator/cardlayout/XWCardTitleLayout.java

@@ -168,6 +168,7 @@ public class XWCardTitleLayout extends XWBorderLayout {
      * 
      * @return designer 表单设计器
      */
+    @Override
 	public void stopAddingState(FormDesigner designer){
     	designer.stopAddingState();
     	return;
@@ -211,6 +212,7 @@ public class XWCardTitleLayout extends XWBorderLayout {
 		return this.getBackupParent().getTopLayout();
 	}
 
+	@Override
 	public String createDefaultName() {
 		return "tabpane";
 	}

designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java

@@ -108,6 +108,7 @@ public class XWTabFitLayout extends XWFitLayout {
 	 * @return 属性名
 	 * @throws IntrospectionException
 	 */
+	@Override
 	public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
 		checkButonType();
 		CRPropertyDescriptor[] crp = ((WTabFitLayout) data).isCustomStyle() ? getisCustomStyle() : getisnotCustomStyle();
@@ -250,7 +251,8 @@ public class XWTabFitLayout extends XWFitLayout {
 	 * @param designer 表单设计器
 	 * 
 	 */
-	public void deleteRelatedComponent(XCreator creator,FormDesigner designer){
+	@Override
+	public void deleteRelatedComponent(XCreator creator, FormDesigner designer){
 		//逐层回溯找出相关的layout和对应的tab按钮
     	XWTabFitLayout fitLayout = (XWTabFitLayout)creator;
     	WTabFitLayout fit = (WTabFitLayout) fitLayout.toData();
@@ -317,6 +319,7 @@ public class XWTabFitLayout extends XWFitLayout {
 	 * @param comp 当前组件
 	 * void
 	 */
+    @Override
 	public void seleteRelatedComponent(XCreator comp){
     	XWTabFitLayout fitLayout = (XWTabFitLayout)comp;
     	WTabFitLayout fit = (WTabFitLayout) fitLayout.toData();
@@ -342,6 +345,7 @@ public class XWTabFitLayout extends XWFitLayout {
 	 * @date 2014-12-30-下午3:15:28
 	 * 
 	 */
+    @Override
 	public XLayoutContainer findNearestFit(){
     	XLayoutContainer parent = this.getBackupParent();
     	return parent == null ? null : parent.findNearestFit();
@@ -351,6 +355,7 @@ public class XWTabFitLayout extends XWFitLayout {
 	 * 非顶层自适应布局的缩放
 	 * @param percent 百分比
 	 */
+	@Override
 	public void adjustCompSize(double percent) {
 		this.adjustCreatorsWhileSlide(percent);
 	}
@@ -369,6 +374,7 @@ public class XWTabFitLayout extends XWFitLayout {
 	 * 
 	 * @param percent 宽度变化的百分比
 	 */
+	@Override
 	public void adjustCreatorsWidth(double percent) {
 		if (this.getComponentCount()==0) {
 			// 初始化没有拖入控件时，实际宽度依然调整
@@ -401,6 +407,7 @@ public class XWTabFitLayout extends XWFitLayout {
 	 * 同时调整容器内的组件们,缩小时需要考虑有的组件高度不满足缩小高度
 	 * @param percent 高度变化的百分比
 	 */
+	@Override
 	public void adjustCreatorsHeight(double percent) {
 		if (this.getComponentCount()==0) {
 			//调整高度后，wlayout那边记录下
@@ -425,6 +432,7 @@ public class XWTabFitLayout extends XWFitLayout {
 		LayoutUtils.layoutContainer(this);
 	}
 	
+	@Override
 	public XLayoutContainer getOuterLayout(){
 		XWCardLayout cardLayout = (XWCardLayout) this.getBackupParent();
 		return cardLayout.getBackupParent();
@@ -458,6 +466,7 @@ public class XWTabFitLayout extends XWFitLayout {
      * 去除原有的间隔
      * @param gap 间隔
      */
+    @Override
 	public void moveCompInterval(int gap) {
     	if (gap == 0) {
     		return;
@@ -515,6 +524,7 @@ public class XWTabFitLayout extends XWFitLayout {
      * ps:改变布局大小或者拖入、删除、拉伸都要重新考虑间隔
      * @param gap 间隔
      */
+    @Override
 	public void addCompInterval(int gap) {
     	if (gap == 0) {
     		return;
@@ -560,6 +570,7 @@ public class XWTabFitLayout extends XWFitLayout {
 		return new WidgetPropertyUIProvider[0];
 	}
 
+	@Override
 	public void firePropertyChange(){
 		checkButonType();
 		//根据字体长度设置tab宽度