OSDN -- Develop and Download Open Source Software
  • R/O
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

FreeTrainの進化系を目指す


Commit MetaInfo

Revision15 (tree)
Time2014-01-27 01:12:05
Authorc477

Log Message

こまかな修正

Change Summary

Incremental Difference

--- trunk/plugins/jp.sourceforge.c477.structures.sample01/plugin.xml (revision 14)
+++ trunk/plugins/jp.sourceforge.c477.structures.sample01/plugin.xml (revision 15)
@@ -9,7 +9,7 @@
99 <condition when="night" src="stationMDNDepart_n.bmp"/>
1010 </contribution>
1111
12- <contribution type="station" id="ModernDepartment01">
12+ <contribution type="ignore" id="ModernDepartment01">
1313 <group>デパート駅舎(土色:A)</group>
1414 <price>18000</price>
1515 <height>2</height>
@@ -38,7 +38,7 @@
3838 <condition when="night" src="station_shop_n.bmp"/>
3939 </contribution>
4040
41- <contribution type="station" id="ArbanShop01">
41+ <contribution type="ignore" id="ArbanShop01">
4242 <group>都市近郊の駅舎</group>
4343 <price>370</price>
4444 <height>1</height>
@@ -62,7 +62,7 @@
6262 <condition when="night" src="terminal_domeA_n.bmp"/>
6363 </contribution>
6464
65- <contribution type="GenericStructure" id="LargeDome">
65+ <contribution type="ignore" id="LargeDome">
6666 <group>空港国際線ターミナル</group>
6767 <design>大型ドーム</design>
6868 <price>100000</price>
@@ -91,7 +91,7 @@
9191 <condition when="night" src="ampark_wheelL_n.bmp"/>
9292 </contribution>
9393
94- <contribution type="GenericStructure" id="AmusementPark.Wheel">
94+ <contribution type="ignore" id="AmusementPark.Wheel">
9595 <group>観覧車</group>
9696 <design>大型</design>
9797 <structure>
@@ -123,7 +123,7 @@
123123 <default src="tettou-s.bmp"/>
124124 </contribution>
125125
126- <contribution type="GenericStructure" id="CableTower_L-1">
126+ <contribution type="ignore" id="CableTower_L-1">
127127 <group>高圧線鉄塔</group>
128128 <structure>
129129 <category byname="送電線鉄塔"/>
@@ -140,7 +140,7 @@
140140 </sprite>
141141 </contribution>
142142
143- <contribution type="GenericStructure" id="CableTower_M-1">
143+ <contribution type="ignore" id="CableTower_M-1">
144144 <group>高圧線鉄塔</group>
145145 <structure>
146146 <category byname="送電線鉄塔"/>
@@ -157,7 +157,7 @@
157157 </sprite>
158158 </contribution>
159159
160- <contribution type="GenericStructure" id="CableTower_S-1">
160+ <contribution type="ignore" id="CableTower_S-1">
161161 <group>高圧線鉄塔</group>
162162 <structure>
163163 <category byname="送電線鉄塔"/>
@@ -189,7 +189,7 @@
189189 <condition when="night" src="gene_hospitalA3_n.bmp"/>
190190 </contribution>
191191
192- <contribution type="GenericStructure" id="Hospital_A">
192+ <contribution type="ignore" id="Hospital_A">
193193 <name>総合病院</name>
194194 <design>郊外型(主)</design>
195195 <structure>
@@ -211,7 +211,7 @@
211211 <image ref="pic.Hospital_A"/>
212212 </sprite>
213213 </contribution>
214- <contribution type="GenericStructure" id="Hospital_B">
214+ <contribution type="ignore" id="Hospital_B">
215215 <name>総合病院</name>
216216 <design>郊外型(副)</design>
217217 <structure>
@@ -261,7 +261,7 @@
261261 </contribution>
262262
263263 <!-- 01 -->
264- <contribution type="GenericStructure" id="CampusBuilding-01">
264+ <contribution type="ignore" id="CampusBuilding-01">
265265 <group>大学</group>
266266 <structure>
267267 <category byname="公立教育施設"/>
@@ -284,7 +284,7 @@
284284 </contribution>
285285
286286 <!--02-->
287- <contribution type="GenericStructure" id="CampusBuilding-02">
287+ <contribution type="ignore" id="CampusBuilding-02">
288288 <group>大学</group>
289289 <structure>
290290 <category byname="公立教育施設"/>
@@ -307,7 +307,7 @@
307307 </contribution>
308308
309309 <!--03-->
310- <contribution type="GenericStructure" id="CampusBuilding-03">
310+ <contribution type="ignore" id="CampusBuilding-03">
311311 <group>大学</group>
312312 <structure>
313313 <category byname="公立教育施設"/>
@@ -330,7 +330,7 @@
330330 </contribution>
331331
332332 <!--tower-->
333- <contribution type="GenericStructure" id="CampusBuilding-tower">
333+ <contribution type="ignore" id="CampusBuilding-tower">
334334 <group>大学</group>
335335 <structure>
336336 <category byname="公立教育施設"/>
@@ -353,7 +353,7 @@
353353 </contribution>
354354
355355 <!--04-->
356- <contribution type="GenericStructure" id="CampusBuilding-04">
356+ <contribution type="ignore" id="CampusBuilding-04">
357357 <group>大学</group>
358358 <structure>
359359 <category byname="公立教育施設"/>
@@ -376,7 +376,7 @@
376376 </contribution>
377377
378378 <!--05-->
379- <contribution type="GenericStructure" id="CampusBuilding-05">
379+ <contribution type="ignore" id="CampusBuilding-05">
380380 <group>大学</group>
381381 <structure>
382382 <category byname="公立教育施設"/>
@@ -405,7 +405,7 @@
405405 </contribution>
406406
407407 <!--06-->
408- <contribution type="GenericStructure" id="CampusBuilding-06">
408+ <contribution type="ignore" id="CampusBuilding-06">
409409 <group>大学</group>
410410 <structure>
411411 <category byname="公立教育施設"/>
@@ -428,7 +428,7 @@
428428 </contribution>
429429
430430 <!--07-->
431- <contribution type="GenericStructure" id="CampusBuilding-07">
431+ <contribution type="ignore" id="CampusBuilding-07">
432432 <group>大学</group>
433433 <structure>
434434 <category byname="公立教育施設"/>
--- trunk/plugins/system/plugin.xml (revision 14)
+++ trunk/plugins/system/plugin.xml (revision 15)
@@ -20,6 +20,12 @@
2020 <description>Independent contributions decrared without specific factroy.</description>
2121 <implementation name="nft.framework.plugin.CtbAnonymousCtbFactory"/>
2222 </contribution>
23+ <contribution type="factory" id="F_Dummy">
24+ <name>Dummy(for debug)</name>
25+ <description>dummy contribtions for debug/development purpose.</description>
26+ <implementation name="nft.framework.plugin.DummyContributionFactory"/>
27+ <declare type="ignore"/>
28+ </contribution>
2329 <contribution type="factory" id="F_SubForm">
2430 <name>SubForm</name>
2531 <description>Child GUI forms</description>
--- trunk/core/core/schedule/Calendar.cs (revision 14)
+++ trunk/core/core/schedule/Calendar.cs (revision 15)
@@ -13,7 +13,7 @@
1313 /// Time instant.
1414 /// </summary>
1515 [Serializable]
16- public class Calendar
16+ public class Calendar : IGlobalModule
1717 {
1818 private static Calendar the_calendar;
1919 public static Calendar ActiveCalendar {
@@ -117,5 +117,12 @@
117117 return null;
118118 }
119119
120+ #region IGlobalModule implementation
121+ public Type RegistType {
122+ get {
123+ return typeof(Calendar);
124+ }
125+ }
126+ #endregion
120127 }
121128 }
--- trunk/framework/framework/plugin/DummｙContribution.cs (revision 14)
+++ trunk/framework/framework/plugin/DummｙContribution.cs (nonexistent)
@@ -1,24 +0,0 @@
1-using System;
2-using System.Xml;
3-using nft.framework.plugin;
4-
5-namespace nft.framework.plugin
6-{
7- /// <summary>
8- /// commercial structure.
9- ///
10- /// Including everything from convenience stores (like Seven-eleven)
11- /// to shopping malls like Walmart.
12- /// </summary>
13- [Serializable]
14- public class DummyContribution : Contribution
15- {
16- /// <summary>
17- /// Dummy Contribution for Debug
18- /// </summary>
19- /// <exception cref="XmlException">If the parsing fails</exception>
20- public DummyContribution(Plugin p, ParamsReader e) : base(p, e) { }
21-
22- // TODO: additional parameters, like population and attractiveness.
23- }
24-}
--- trunk/framework/framework/plugin/PluginManager.cs (revision 14)
+++ trunk/framework/framework/plugin/PluginManager.cs (revision 15)
@@ -497,11 +497,11 @@
497497 //
498498 public IContributionFactory GetContributionFactory( string name ) {
499499 string anam = AdjustFactoryName(name);
500- IContributionFactory factory = contributionFactories[anam];
501- if(factory==null)
500+ IContributionFactory factory = null;
501+ if(contributionFactories.TryGetValue(anam,out factory))
502+ return factory;
503+ else
502504 throw new Exception(name + "は未知のコントリビューションです");
503- else
504- return factory;
505505 }
506506
507507 static string AdjustFactoryName(string orignam) {
--- trunk/framework/framework/plugin/DummyContribution.cs (nonexistent)
+++ trunk/framework/framework/plugin/DummyContribution.cs (revision 15)
@@ -0,0 +1,43 @@
1+using System;
2+using System.Xml;
3+using nft.framework.plugin;
4+using System.Diagnostics;
5+
6+namespace nft.framework.plugin
7+{
8+ public class DummyContributionFactory : Contribution, IContributionFactory {
9+ public DummyContributionFactory(Plugin p, ParamsReader contrib)
10+ : base(p, contrib) {
11+ }
12+
13+ #region IContributionFactory メンバ
14+ public Type OutputType {
15+ get {
16+ return typeof(DummyContribution);
17+ }
18+ }
19+
20+ public Contribution load(Plugin owner, ParamsReader e) {
21+ return new DummyContribution(owner, e);
22+ }
23+ #endregion
24+ }
25+
26+ /// <summary>
27+ /// commercial structure.
28+ ///
29+ /// Including everything from convenience stores (like Seven-eleven)
30+ /// to shopping malls like Walmart.
31+ /// </summary>
32+ [Serializable]
33+ public class DummyContribution : Contribution
34+ {
35+ /// <summary>
36+ /// Dummy Contribution for Debug
37+ /// </summary>
38+ /// <exception cref="XmlException">If the parsing fails</exception>
39+ public DummyContribution(Plugin p, ParamsReader e) : base(p, e) { }
40+
41+ // TODO: additional parameters, like population and attractiveness.
42+ }
43+}