Project

General

Profile

3856b_datetime_picker.patch

Sergey Ivanovskiy, 01/14/2020 03:55 PM

Download (9.34 KB)

View differences:

rules/annotations/ocx_conversion.rules 2020-01-14 20:11:25 +0000
116 116
   <variable name="map3"           type="java.util.Map" />
117 117
   <variable name="map4"           type="java.util.Map" />
118 118
   <variable name="map5"           type="java.util.Map" />
119
   <variable name="map6"           type="java.util.Map" />
119 120

  
120 121
   <variable name="ref"            type="com.goldencode.ast.AnnotatedAst" />
121 122
   <variable name="ref1"           type="com.goldencode.ast.Aast" />
......
224 225
         <action>widgetKwords.put("HTML-BROWSER", prog.kw_html_bws)</action>
225 226
         <action>widgetKwords.put("IMAGELIST", prog.kw_il_img)</action>
226 227
         <action>widgetKwords.put("PROGRESS-BAR", prog.kw_prog_bar)</action>
228
         <action>widgetKwords.put("DATETIME-PICKER", prog.kw_dtpicker)</action>
227 229

  
228 230
         <action>widgetClasses = create("java.util.HashMap")</action>
229 231
         <action>widgetClasses.put("TREELIST", classForName("com.goldencode.p2j.ui.TreeList"))</action>
......
232 234
         <action>widgetClasses.put("HTML-BROWSER", classForName("com.goldencode.p2j.ui.HtmlBrowser"))</action>
233 235
         <action>widgetClasses.put("IMAGELIST", classForName("com.goldencode.p2j.ui.ImageList"))</action>
234 236
         <action>widgetClasses.put("PROGRESS-BAR", classForName("com.goldencode.p2j.ui.ProgressBar"))</action>
237
         <action>widgetClasses.put("DATETIME-PICKER", classForName("com.goldencode.p2j.ui.DateTimePicker"))</action>
235 238

  
236 239
         <!-- fill the method aliases, where the key is the original com method/property name (in lower case),
237 240
              the rules will prepend is/get/set accordingly to the aliased values so for properties,
......
282 285
         <action>map5.put("mousepointer"          , "ProgBarMousePointer")</action>
283 286
         <action>map5.put("refresh"               , "progBarRefresh")</action>
284 287
         <action>aliasMap.put("PROGRESS-BAR"      , map5)</action>
285
    
288
         
289
         <!-- DTPicker -->
290
         <action>map6 = create("java.util.HashMap")</action>
291
         <action>map6.put("value"             , "DTPValue")</action>
292
         <action>aliasMap.put("DATETIME-PICKER"   , map6)</action>
286 293
      </rule>
287 294
   </init-rules>
288 295

  
rules/convert/methods_attributes.rules 2020-01-14 20:23:58 +0000
958 958
         <rule>list.put(prog.kw_dclk_exp, execLib("cr_descr", "TreeFace"                   , "isDblClickExpanding"    , "setDblClickExpanding"   , true       ))</rule>
959 959
         <rule>list.put(prog.kw_dd_otree, execLib("cr_descr", "TreeFace"                   , "isDragDropOtherTree"    , "setDragDropOtherTree"   , true       ))</rule>
960 960
         <rule>list.put(prog.kw_dec_sep,  execLib("cr_descr", "TreeList"                   , "getDecimalSeparator"    , "setDecimalSeparator"    , true       ))</rule>
961
         <rule>list.put(prog.kw_dtpvalue, execLib("cr_descr", "DateTimePicker"             , "getDTPValue"            , "setDTPValue"            , true       ))</rule>
961 962
         <rule>list.put(prog.kw_dragdrop, execLib("cr_descr", "TreeFace"                   , "isDragDrop"             , "setDragDrop"            , true       ))</rule>
962 963
         <rule>list.put(prog.kw_eh_fl,    execLib("cr_descr", "BrowseElement"              , "isEnhancedFiltering"    , "setEnhancedFiltering"   , true       ))</rule>
963 964
         <rule>list.put(prog.kw_eh_sr,    execLib("cr_descr", "BrowseElement"              , "isEnhancedSorting"      , "setEnhancedSorting"     , true       ))</rule>
rules/convert/ui_statements.rules 2020-01-14 13:50:48 +0000
957 957
            <action>explicitw = "DialogBox"</action>
958 958
         </rule>
959 959
         <rule>explicitw == null and 
960
               (downPath("KW_DTPICKER") or evalLib("match_widget_type", "datetime-picker"))
961
            <action>explicitw = "DateTimePicker"</action>
962
         </rule>
963
         <rule>explicitw == null and 
960 964
               (downPath("KW_EDITOR") or evalLib("match_widget_type", "editor"))
961 965
            <action>explicitw = "Editor"</action>
962 966
         </rule>
rules/gaps/expressions.rules 2020-01-14 12:18:54 +0000
1732 1732
         
1733 1733
         <rule>widAndQual.put(prog.kw_as       , rw.cvt_lvl_full       | rw.rt_lvl_full)</rule>
1734 1734
         <rule>widAndQual.put(prog.kw_browse   , rw.cvt_lvl_full       | rw.rt_lvl_full)</rule>
1735
         <rule>widAndQual.put(prog.kw_dtpicker , rw.cvt_lvl_partial    | rw.rt_lvl_partial)</rule>
1735 1736
         <rule>widAndQual.put(prog.kw_tabset   , rw.cvt_lvl_partial    | rw.rt_lvl_partial)</rule>
1736 1737
         <rule>widAndQual.put(prog.kw_img_list , rw.cvt_lvl_partial    | rw.rt_lvl_partial)</rule>
1737 1738
         <rule>widAndQual.put(prog.kw_treelist , rw.cvt_lvl_full       | rw.rt_lvl_partial)</rule>
src/com/goldencode/p2j/uast/progress.g 2020-01-14 20:27:04 +0000
5162 5162
         KW_IL_OVER;
5163 5163
         KW_IL_UMASK;
5164 5164
         KW_ADD_IMG;    // end IMAGELIST
5165
         KW_MS_CLICK;   // begin PROGESS-BAR
5165
         KW_MS_CLICK;   // begin PROGRESS-BAR
5166 5166
         KW_MS_DOWN;
5167 5167
         KW_MS_MOVE;
5168 5168
         KW_MS_UP;
......
5197 5197
         KW_PB_SCROL;
5198 5198
         KW_PB_MSPNT;
5199 5199
         KW_PB_MSICO;
5200
         KW_COM_DATA;    // end PROGESS-BAR
5200
         KW_COM_DATA;    // end PROGRESS-BAR
5201
         KW_DTPICKER;    // DATETIME-PICKER
5202
         KW_DTPVALUE;    // DATETIME-PICKER
5201 5203
      END_FWD_EXTENSION;
5202 5204
   END_UNRESERVED;
5203 5205
   BEGIN_CALLGRAPH;
......
8224 8226
      attrsAndMethods.put( KW_DOMAIN_N, ATTR_CHAR    );
8225 8227
      attrsAndMethods.put( KW_DOMAIN_T, ATTR_CHAR    );
8226 8228
      attrsAndMethods.put( KW_DOWN    , ATTR_INT     );
8229
      attrsAndMethods.put( KW_DTPVALUE, ATTR_CHAR    ); // FWD DATETIME-PICKER extension, not real 4GL
8227 8230
      attrsAndMethods.put( KW_DRAG_EN , ATTR_LOGICAL );
8228 8231
      attrsAndMethods.put( KW_DRAGDROP, ATTR_LOGICAL ); // FWD extension, not real 4GL
8229 8232
      attrsAndMethods.put( KW_DROP_TAR, ATTR_LOGICAL );
......
24445 24448
         | KW_COMBO_BX   { is_widget = true; }
24446 24449
         | KW_CNTRL_FR   { is_widget = true; }
24447 24450
         | KW_DIALOG     { is_widget = true; }
24451
         | KW_DTPICKER   { is_widget = true; }
24448 24452
         | KW_EDITOR     { is_widget = true; }
24449 24453
         | KW_FILL_IN    { is_widget = true; }
24450 24454
         | KW_FRAME      { is_widget = true; }
......
33274 33278
         new Keyword("date"                           ,  0, KW_DATE    , false),
33275 33279
         new Keyword("datetime"                       ,  0, KW_DATETIME, false),  // missing from keyword index and UNTESTED at this time
33276 33280
         new Keyword("datetime-tz"                    ,  0, KW_DATE_TZ , false),  // missing from keyword index and UNTESTED at this time
33281
         new Keyword("datetime-picker"                ,  0, KW_DTPICKER, false),  // FWD DATETIME-PICKER extension, not a real 4GL keyword
33277 33282
         new Keyword("date-format"                    ,  6, KW_DATE_FMT, false),
33278 33283
         new Keyword("date-separator"                 ,  0, KW_DATE_SEP, false),  // FWD extension, not a real 4GL keyword
33279 33284
         new Keyword("day"                            ,  0, KW_DAY     , false),
......
33382 33387
         new Keyword("drop-file-notify"               ,  0, KW_DROP_FN , false),
33383 33388
         new Keyword("drop-target"                    ,  0, KW_DROP_TAR, false),
33384 33389
         new Keyword("dslog-manager"                  ,  0, KW_DSL_MGR , false),
33390
         new Keyword("dtp-value"                      ,  0, KW_DTPVALUE, false),  // FWD DATETIME-PICKER extension, not a real 4GL keyword
33385 33391
         new Keyword("dump"                           ,  0, KW_DUMP    , false),
33386 33392
         new Keyword("dump-logging-now"               ,  0, KW_DUMP_LGN, false),  // missing from keyword index and UNTESTED at this time
33387 33393
         new Keyword("dynamic-cast"                   ,  0, KW_DYN_CAST, false),  // missing from keyword index and UNTESTED at this time
src/com/goldencode/p2j/util/LegacyResource.java 2020-01-14 13:52:47 +0000
192 192
   /** Constant identifying the DIALOG-BOX resource. */
193 193
   public static String DIALOG_BOX = "DIALOG-BOX";
194 194

  
195
   /** Constant identifying the DATETIME-PICKER resource. */
196
   public static String DATETIME_PICKER = "DATETIME-PICKER";
197

  
195 198
   /** Constant identifying the  resource. */
196 199
   public static String EDITOR = "EDITOR";
197 200

  
src/com/goldencode/p2j/util/handle.java 2020-01-14 15:54:06 +0000
2729 2729
      return unwrapImpl(this, BlankInterface.class);
2730 2730
   }
2731 2731

  
2732
   public DateTimePicker unwrapDateTimePicker()
2733
   {
2734
      return unwrapImpl(this, DateTimePicker.class);
2735
   }
2736

  
2732 2737
   /**
2733 2738
    * Unwrap this handle to a {@link DeblankInterface} instance. If the
2734 2739
    * handle is not a widget handle or is invalid, an