Merge pull request #6 in PF/design from ~DANIEL/finereport_design:dev to dev

* commit '16836bcceed76907c629fd2caf57a50834abe640':
  国际化
  object instance

designer/src/com/fr/design/actions/cell/NewPresentAction.java

@@ -26,7 +26,7 @@ public class NewPresentAction extends PresentCheckBoxAction {
     @Override
     public boolean executeActionReturnUndoRecordNeeded() {
         if (!ComparatorUtils.equals(this.itemName, "NOPRESENT")) {
-            CellElementPropertyPane.getInstance().GoToPane(Inter.getLocText("Present"), this.itemName);
+            CellElementPropertyPane.getInstance().GoToPane(Inter.getLocText("FR-Designer_Present"), this.itemName);
         } else {
             TemplateCellElement ce = getSelectedCellElement();
             // 只有原来ce设置了形态的情况下才有undo操作
@@ -73,7 +73,7 @@ public class NewPresentAction extends PresentCheckBoxAction {
             try {
                 Class clazz = GeneralUtils.classForName(itemName);
                 if (itemName.equals(currentPresent.getClass().getName())) {
-                    return StableUtils.classInstanceOf(currentPresent.getClass(), clazz);
+                    return StableUtils.objectInstanceOf(currentPresent, clazz);
                 }
             } catch (Exception e) {
                 return "NOPRESENT".equals(itemName) && currentPresent == null;

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

@@ -426,7 +426,7 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
      */
     public boolean acceptType(Class<?>... acceptTypes) {
         for (Class<?> type : acceptTypes) {
-            if (StableUtils.classInstanceOf(this.getClass(), type)) {
+            if (StableUtils.objectInstanceOf(this, type)) {
                 return true;
             }
         }