From c10258a15b649d4b71ff3aeb59bec248b874126f Mon Sep 17 00:00:00 2001
From: Kai Brassel <mail@khbrassel.de>
Date: Tue, 18 May 2021 20:59:33 +0200
Subject: [PATCH] UI improvements
---
.../Application.e4xmi | 12 ++---
.../icons/blue-folder-open.png | Bin 0 -> 510 bytes
.../icons/database-plus.png | Bin 0 -> 614 bytes
.../icons/disk-black.png | Bin 0 -> 433 bytes
.../icons/open_in_app.png | Bin 315 -> 0 bytes
.../icons/save_edit.png | Bin 367 -> 0 bytes
.../icons/full/obj16/Catalog.gif | Bin 129 -> 0 bytes
.../icons/full/obj16/Layer.gif | Bin 129 -> 0 bytes
.../icons/full/obj16/LifeCycle.gif | Bin 129 -> 0 bytes
.../icons/full/obj16/Material.gif | Bin 129 -> 0 bytes
.../icons/full/obj16/MaterialCatalog.gif | Bin 129 -> 3527 bytes
.../icons/full/obj16/Mounting.gif | Bin 129 -> 0 bytes
.../icons/full/obj16/WindowCatalog.gif | Bin 129 -> 3422 bytes
.../icons/full/obj16/WindowType.gif | Bin 129 -> 0 bytes
.../plugin.properties | 19 ++++----
.../provider/CatalogItemProvider.java | 11 -----
.../ConstructionCategoryItemProvider.java | 41 +-----------------
.../provider/LayerItemProvider.java | 11 -----
.../provider/MaterialCatalogItemProvider.java | 17 +-------
.../MaterialCategoryItemProvider.java | 41 +-----------------
.../provider/MaterialItemProvider.java | 11 -----
.../provider/MountingItemProvider.java | 11 -----
.../provider/WindowCatalogItemProvider.java | 12 +----
.../provider/WindowTypeItemProvider.java | 11 -----
.../viewmodels/ConstructionCategory.view | 9 +++-
.../viewmodels/WindowCatalog.view | 19 +-------
.../model/buildingphysics.genmodel | 20 ++++-----
27 files changed, 41 insertions(+), 204 deletions(-)
create mode 100644 de.hftstuttgart.buildingphysics.application/icons/blue-folder-open.png
create mode 100644 de.hftstuttgart.buildingphysics.application/icons/database-plus.png
create mode 100644 de.hftstuttgart.buildingphysics.application/icons/disk-black.png
delete mode 100644 de.hftstuttgart.buildingphysics.application/icons/open_in_app.png
delete mode 100644 de.hftstuttgart.buildingphysics.application/icons/save_edit.png
delete mode 100644 de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Catalog.gif
delete mode 100644 de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Layer.gif
delete mode 100644 de.hftstuttgart.buildingphysics.edit/icons/full/obj16/LifeCycle.gif
delete mode 100644 de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Material.gif
delete mode 100644 de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Mounting.gif
delete mode 100644 de.hftstuttgart.buildingphysics.edit/icons/full/obj16/WindowType.gif
diff --git a/de.hftstuttgart.buildingphysics.application/Application.e4xmi b/de.hftstuttgart.buildingphysics.application/Application.e4xmi
index c902850..54370e8 100644
--- a/de.hftstuttgart.buildingphysics.application/Application.e4xmi
+++ b/de.hftstuttgart.buildingphysics.application/Application.e4xmi
@@ -3,9 +3,9 @@
<children xsi:type="basic:TrimmedWindow" xmi:id="_6wlLccgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.window.main" label="HfT Stuttgart - Building Physics Catalog" width="800" height="600">
<mainMenu xmi:id="_6wlLicgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.main.menu">
<children xsi:type="menu:Menu" xmi:id="_6wlLisgZEeSyMNYR5xypkQ" elementId="file" label="File">
- <children xsi:type="menu:HandledMenuItem" xmi:id="_y6FesCWUEeux0PTSTJn6xg" elementId="de.hftstuttgart.buildingphysics.application.handleditem.file.new" label="New..." command="_PnX_ACWUEeux0PTSTJn6xg"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLi8gZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.file.open" label="Open" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/open_in_app.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLjMgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.save" label="Save" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/save_edit.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_y6FesCWUEeux0PTSTJn6xg" elementId="de.hftstuttgart.buildingphysics.application.handleditem.file.new" label="New..." iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/database-plus.png" command="_PnX_ACWUEeux0PTSTJn6xg"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLi8gZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.file.open" label="Open" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/blue-folder-open.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLjMgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.save" label="Save" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/disk-black.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
<children xsi:type="menu:HandledMenuItem" xmi:id="_6wlLjcgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.quit" label="Quit" command="_6wlLfMgZEeSyMNYR5xypkQ"/>
</children>
<children xsi:type="menu:Menu" xmi:id="_6wlLjsgZEeSyMNYR5xypkQ" elementId="help" label="Help">
@@ -14,9 +14,9 @@
</mainMenu>
<trimBars xmi:id="_6wlLlcgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.trimbar.top">
<children xsi:type="menu:ToolBar" xmi:id="_6wlLlsgZEeSyMNYR5xypkQ" elementId="org.eclipse.ui.main.toolbar">
- <children xsi:type="menu:HandledToolItem" xmi:id="_rXiTQCWUEeux0PTSTJn6xg" elementId="de.hftstuttgart.buildingphysics.application.handleditem.trimbar.top.new" label="New..." command="_PnX_ACWUEeux0PTSTJn6xg"/>
- <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLl8gZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.trimbar.top.open" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/open_in_app.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
- <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLmMgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.trimbar.top.save" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/save_edit.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
+ <children xsi:type="menu:HandledToolItem" xmi:id="_rXiTQCWUEeux0PTSTJn6xg" elementId="de.hftstuttgart.buildingphysics.application.handleditem.trimbar.top.new" label="New..." iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/database-plus.png" command="_PnX_ACWUEeux0PTSTJn6xg"/>
+ <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLl8gZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.trimbar.top.open" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/blue-folder-open.png" command="_6wlLgMgZEeSyMNYR5xypkQ"/>
+ <children xsi:type="menu:HandledToolItem" xmi:id="_6wlLmMgZEeSyMNYR5xypkQ" elementId="de.hftstuttgart.buildingphysics.application.handleditem.trimbar.top.save" iconURI="platform:/plugin/de.hftstuttgart.buildingphysics.application/icons/disk-black.png" command="_6wlLg8gZEeSyMNYR5xypkQ"/>
</children>
</trimBars>
</children>
diff --git a/de.hftstuttgart.buildingphysics.application/icons/blue-folder-open.png b/de.hftstuttgart.buildingphysics.application/icons/blue-folder-open.png
new file mode 100644
index 0000000000000000000000000000000000000000..49f61097bb670a9e860e829ebfbba0a298f7943d
GIT binary patch
literal 510
zcmV<a0RjGrP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzph-kQRCwBqQ!z*bF%<pR%T<elRx4Oq
zu`Z%wmpT?4T*X1q#mTvw2%@9t;L=4L1;-8!E?r!lil7!O7Nvqv53~v{LKWJ2$u~*4
z>s_vbA0C&V{JgyXF3}JXMCi-gtNas(|HTW(DLp#?;!Gio9c`><pI+bj7$FgjKx}vr
z3_?6R4THeqR(8|QT?812M+P7o?t{;-22|fZ;OeddOX-w{AQTG8T00N86a*M!&}cNF
zmuQfhOhBt;0b}Tcs0H*Z&?!X_5J4$}W|KO(9Wv*&U0d)HAXn1@%VHh^nRjmib<u(w
z)S^;}3aJ1w=_O#`wBUfBW+|xGzu{yjv&-vOd>+_Ewp2l&dZ7ByAz-SBC|giHaC~4Y
z0U~jJli*|6>Di}1`arw{6p4F7drTcdcgQ)a5a18(S6k4y$H8Eaa+M9p>>VES#hh1x
zMa^9PqLfa}jz>p^!s3)-xndT}kC#3P8kj)zYsCZDFO(i`3b*(36S2{$^jvb9&z1SY
z8gyas-^8|&=K@u;HdB4BE%0%qU9bK5u73p>0JR4_bIdk94*&oF07*qoM6N<$g2am2
AApigX
literal 0
HcmV?d00001
diff --git a/de.hftstuttgart.buildingphysics.application/icons/database-plus.png b/de.hftstuttgart.buildingphysics.application/icons/database-plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..99f26880ba3e685d6ed11ce211f7d3c4744c4d56
GIT binary patch
literal 614
zcmV-s0-61ZP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!2uVaiRCwBylfjGAP!PtymxiQCnpCie
z>!F~C*B<nu7eQEA*zRFLD&E9XK~x0KJr+E96NDntKR^$9@T50E*<Q34yCN)tx@p>)
zHEEjm<;6)`w=J%29T@U>%zVuEn-><xF_I{iN*nZ9!E*79@_BNQf8T^*xKgXt9{IkH
zAPB&Dgm&Abvp_nn!8A=+mW6EALb-hPW-67!f<O|SbGWXHPNy>#u<f51gaU?Pf=3)u
zN`h`^3!_N?9Fzfx!I+6jVv@@XQ2C@Wo;FA0oR4`6jcT>}qEILlg%IfX`%^2N7^IQO
zWXOLOtyb$L)ovXmaJEvZ6z3t@&K~^15Q?fGV;aa3#MSl9wcF(z$p+pX3USwQ;SYz<
z2;4{<A&7vctN#OW=3TJpPzDEYVSfV=?%NOW`TGuf7u(m4I@Uuj`0^0D1o8c`4_GZ;
z#*=nE_chlh&+$xvn*M~?{Q)=d@i?esJKTmYX>cPKa-Zp3jkjp5#=d~(dGR7dj@@1l
z?$Aeb(8Q^Y)8jgaJ2=02Ay3Er>!+_~6Ht@<x5t!^PhjWSC&;o4WzE3Hdh^RD9ofXF
zF)yGe1<7Mk6lH87rE1Uzd$_CKf|1d1=j}aoqb`KU8DlsXtBe*k{hjG=yG~=Dj3Qdq
z<c=koR3<4&5=NKAy2#-;li3@{?20&};Fkac0CTD+*fF6$@&Et;07*qoM6N<$g4%>0
Apa1{>
literal 0
HcmV?d00001
diff --git a/de.hftstuttgart.buildingphysics.application/icons/disk-black.png b/de.hftstuttgart.buildingphysics.application/icons/disk-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..26507e51bf6ddc4dc3bb7c859ce1be402d5b5bc0
GIT binary patch
literal 433
zcmV;i0Z#sjP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzQ%OWYRCwB?Q@w73Fc3bBEy2(osS?WG
zhhXbowQJ`tk(wu<YQ&ZWmJX;}*QyWD2k6Swt%|xZvqTXxKkl6iD1-ze<)p*r`0nHL
z-Puq|!8yk1!5DkS<?7D&KTk<|UoNk4`L65w2}prq7#~3pD6)FO$p}k1l*=1ZCZ&WD
z165Ux{@pZ9AS~r{N1zv!0}_*qq8KF*=!D%TFzL@kkWUaO##)tTkDx3|kjOkmz=Qz8
z4hV?#cfE$o*=&@6Fh>=<M$t*Vw{82df+R`c*kEDXy1nOl0|HJ8s6}BI4LTw4+>6B{
zxULInnzl9IJpxj|Ifu<Ahxz<L2Un}GlT6>pEX!(Z&?68y&Kk7cN^l%U2WhWcr_3Hf
zGY6s@20XVP$MH{=Wx13}gUOZp_cpdmfH@bsHqBk2{SEpH0^bf55zl?U7y827TjSj8
b{3pNwM={yTe}a?Z00000NkvXXu0mjf{wBQ%
literal 0
HcmV?d00001
diff --git a/de.hftstuttgart.buildingphysics.application/icons/open_in_app.png b/de.hftstuttgart.buildingphysics.application/icons/open_in_app.png
deleted file mode 100644
index 9df4eeb7c3b8e6d1ff41f77b6032062a0edb4695..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 315
zcmeAS@N?(olHy`uVBq!ia0vp^!ayv*!3HG19C1kkQY^(zo*^7SP{WbZ0pxQQctjQh
z)vX6%#^h&xhk=5UC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gP2NC6e?@N{tu
zvFLq!c_Zf`2a#hR|94N4j5!#h_dtj-IC6$*&L^$u0lP(-9tcGq(CS-Y%+i-WQA1Ox
zPvYRQ^?&>B?`^JLw5nQxRjow5e^JI{mCn~M?{nG+9N49EIwo|volnTsn)X>SE>Et6
z&X~!4c*BQ#*SvDl3gaU~uj)!P{4~n<FB6@3H{jrzZ3mbZ^xoa9W6ggw#I!c?e$6xa
z-=^2%ma_-cB<M6sUip6}Q2!TCM6bjd)&m<Ej~`)dSMO;yV2V__vIXb|22WQ%mvv4F
FO#o*oc`^V1
diff --git a/de.hftstuttgart.buildingphysics.application/icons/save_edit.png b/de.hftstuttgart.buildingphysics.application/icons/save_edit.png
deleted file mode 100644
index b17caf5a984540e8b1448057feeecc5183c58eaa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 367
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>2?p
zD}XSgpwrRCKtah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$mfQsIDx;Tbd
z^e&ye){i+*pml%du1%avUa2i%V&oG_iH&CnnZKY-K62-?9(QxoJr43rp7D$mBvLj?
zux*}gQc%A8f@fadvpdE6&WI+zv+M4te$bHjHAv*>5}niK43oDoay_VY{~%!TkJHeT
zagA#4?Mv_MdONO8`@-c@C42nbRn8AP_!%B-iNCC}_SPK1!YP-t4+zZom)=sle}nLc
z$hr2+`x<6XxumevgyEgm+wiZ&N*@$5cV5+3iDlUACp_b(m9qWQJ&_JBb5fstKF9DN
z>{9C89lu2j<{Do+ePv5${#Dzoiu+$0EI(XKkl5OKHs>F&{AoMO<{t+vf&OOjboFyt
I=akR{0M|T{IRF3v
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Catalog.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Catalog.gif
deleted file mode 100644
index cb1755a712505aeaaa447d9b1cc5940e602f87b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 129
zcmZ?wbhEHb6krfw*vtS14M4Jip`qcxfddT<4GjN*-2XuK|Nmgte-L}loH;<LW5GR&
zKUo+V7&sYpKsrHYFtF$uob+71*W&e;Zz}u`3thLHvffHb@LI6&tBu~rX=+!^%6nF7
S^6M^V>~uRaQAn7P!5RSBPcTCO
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Layer.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Layer.gif
deleted file mode 100644
index 45731fe28e7e3521c15328ef201d58b47a13b383..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 129
zcmZ?wbhEHb6krfw*vtS14M4Jip`qcxfddT<4GjN*-2XuK|Nmgte-L}-nKYo3gM)+O
zPZmZ722KVYkWP>p3@myECp}m1wRrvIn+pHKLf7r4thZ7UycR6{YNPjYn%Y&f@}8BN
S{JP5-JKc^<6cT1+um%8^{x4Mk
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/LifeCycle.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/LifeCycle.gif
deleted file mode 100644
index 48e3cf2268736efbb8bc3c5bd29315702f2b38c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 129
zcmZ?wbhEHb6krfw*vtS14M4Jip`qcxfddT<4GjN*-2XuK|Nmgte-JzEOd3$i!NEcC
zCkrD311EzHNGHe)1{OVolb);hTD<=9O@;qqq3d>2)>|nFUJDj}wbA=HP3@{#dCy8s
Se%<Aaoo+`a3JEhZSOWlvr!OJ^
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Material.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Material.gif
deleted file mode 100644
index afb82ea48a50d3fb875ce03cf0ec154e51c97cb7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 129
zcmZ?wbhEHb6krfw*vtS14M4Jip`qcxfddT<4GjN*-2XuK|Nmgt|Nqz4G#%>+UQ=w@
z7OA87lZBCifs;W8q!VNY1B;%)Nzc`LEna{5ro#WQ&~>{h>#dXouLTRg+UR|prgqh=
Vyl15*zwUCzPPZcyg@hRytO10rFBSj*
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/MaterialCatalog.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/MaterialCatalog.gif
index 05dc74ad5da0d7b040b29537d5b24f2b120b11d5..272419503027609edd05679b2f0d4c5b5ccb195c 100644
GIT binary patch
literal 3527
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
BPUQdq
literal 129
zcmZ?wbhEHb6krfw*vtS14M4Jip`qcxfddT<4GjN*-2XuK|Nmgte-L}loH>`4RXR90
zDE?$&WMJTA&;jWLnZdxKXK>PU^<InDU%sjEKP+_JZpwNqCBbXK!ml=ZAE&8ZH7oB~
TsmZUqoUzmG$V4GwMh0sDy9qDP
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Mounting.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/Mounting.gif
deleted file mode 100644
index 45731fe28e7e3521c15328ef201d58b47a13b383..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 129
zcmZ?wbhEHb6krfw*vtS14M4Jip`qcxfddT<4GjN*-2XuK|Nmgte-L}-nKYo3gM)+O
zPZmZ722KVYkWP>p3@myECp}m1wRrvIn+pHKLf7r4thZ7UycR6{YNPjYn%Y&f@}8BN
S{JP5-JKc^<6cT1+um%8^{x4Mk
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/WindowCatalog.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/WindowCatalog.gif
index 9250fecbffd185d174d53f6b7ea979f63ce222d2..178791c3d7f0f77647000dd2e93d63c2c8e42ba0 100644
GIT binary patch
literal 3422
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
A8UO$Q
literal 129
zcmZ?wbhEHb6krfw*vtS14M4Jip`qcxfddT<4GjN*-2XuK|Nmgt|NqyT)*K7&Sz}q;
zrW2|7lZBCifs;W8q!VNY1B;%)Nzc`LEna{5ro#WQ&~>{h>#dXouLTRg+UR|prgqh=
Vyl15*zwUCzPPZcyg@hRytO0}LFBSj*
diff --git a/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/WindowType.gif b/de.hftstuttgart.buildingphysics.edit/icons/full/obj16/WindowType.gif
deleted file mode 100644
index 30f0c48da8d4450f7e94a696c4de0a7cc41aa728..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 129
zcmZ?wbhEHb6krfw*vtS14M4Jip`qcxfddT<4GjN*-2XuK|Nmgte-L}loH;<LW5L0S
zKUo+V7&sYpKsrHYFtF$uob+71*W&e;Zz}u`3thLHvffHb@LI6&tBu~rX=+!^%6nF7
S^6M^V>~uRaQAn7P!5RR`@-PYj
diff --git a/de.hftstuttgart.buildingphysics.edit/plugin.properties b/de.hftstuttgart.buildingphysics.edit/plugin.properties
index 1a63365..93c2813 100644
--- a/de.hftstuttgart.buildingphysics.edit/plugin.properties
+++ b/de.hftstuttgart.buildingphysics.edit/plugin.properties
@@ -15,9 +15,9 @@ _UI_PropertyDescriptor_description = The {0} of the {1}
_UI_BuildingPhysicsCatalog_type = Catalog
_UI_WindowType_type = Window Type
_UI_Catalog_type = Catalog
-_UI_WindowCatalog_type = Window Catalog
-_UI_MaterialCatalog_type = Material Catalog
-_UI_MaterialCategory_type = Material Category
+_UI_WindowCatalog_type = Windows
+_UI_MaterialCatalog_type = Materials and Constructions
+_UI_MaterialCategory_type =
_UI_Material_type = Material
_UI_Unknown_type = Object
@@ -46,7 +46,6 @@ _UI_Material_heatCapacity_feature = Heat Capacity
_UI_Material_conductivity_feature = Conductivity
_UI_Unknown_feature = Unspecified
-_UI_Catalog_xxx_feature = Xxx
_UI_LifeCycle_type = Life Cycle
_UI_WindowType_lifeCycle_feature = Life Cycle
_UI_LifeCycle_embodiedEnergy_feature = Embodied Energy
@@ -55,8 +54,8 @@ _UI_LifeCycle_constructionDescription_feature = Construction Description
_UI_LifeCycle_disposalEnergy_feature = Disposal Energy
_UI_LifeCycle_disposalCarbon_feature = Disposal Carbon
_UI_LifeCycle_disposalDescription_feature = Disposal Description
-_UI_WindowType__feature =
-_UI_LifeCycle__feature =
+_UI_WindowType__feature = Window Type
+_UI_LifeCycle__feature = Life Cycle
_UI_LifeCycle_type_feature = Type
_UI_WindowType_embodiedEnergy_feature = Embodied Energy
_UI_WindowType_embodiedCarbon_feature = Embodied Carbon
@@ -70,11 +69,11 @@ _UI_Material_constructionDescription_feature = Construction Description
_UI_Material_disposalEnergy_feature = Disposal Energy
_UI_Material_disposalCarbon_feature = Disposal Carbon
_UI_Material_disposalDescription_feature = Disposal Description
-_UI_ConstructionCategory_type = Construction Category
+_UI_ConstructionCategory_type = Constructions
_UI_Mounting_type = Mounting
_UI_Layer_type = Layer
-_UI_MaterialCatalog_constructionCategories_feature = Construction Categories
-_UI_ConstructionCategory_name_feature = Name
+_UI_MaterialCatalog_constructionCategories_feature = Constructions
+_UI_ConstructionCategory_name_feature = Construction Category
_UI_ConstructionCategory_mountings_feature = Mountings
_UI_Mounting_id_feature = Id
_UI_Mounting_name_feature = Name
@@ -85,4 +84,4 @@ _UI_MaterialCategory_materials_feature = Materials
_UI_WindowType_windowTypeId_feature = Window Type Id
_UI_Material_materialId_feature = Material Id
_UI_Mounting_mountingId_feature = Mounting Id
-_UI_Layer__feature =
+_UI_Layer__feature = Layer
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/CatalogItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/CatalogItemProvider.java
index 954fc33..51af9ae 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/CatalogItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/CatalogItemProvider.java
@@ -107,17 +107,6 @@ public class CatalogItemProvider extends ItemProviderAdapter implements IEditing
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
- /**
- * This returns Catalog.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/Catalog"));
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/ConstructionCategoryItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/ConstructionCategoryItemProvider.java
index 008bb50..9e64054 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/ConstructionCategoryItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/ConstructionCategoryItemProvider.java
@@ -2,7 +2,6 @@
*/
package de.hftstuttgart.buildingphysics.provider;
-import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.ConstructionCategory;
@@ -13,9 +12,6 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -77,36 +73,6 @@ public class ConstructionCategoryItemProvider extends ItemProviderAdapter implem
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(BuildingPhysicsPackage.Literals.CONSTRUCTION_CATEGORY__MOUNTINGS);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
/**
* This returns ConstructionCategory.gif.
* <!-- begin-user-doc -->
@@ -154,10 +120,8 @@ public class ConstructionCategoryItemProvider extends ItemProviderAdapter implem
switch (notification.getFeatureID(ConstructionCategory.class)) {
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__NAME:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
- return;
case BuildingPhysicsPackage.CONSTRUCTION_CATEGORY__MOUNTINGS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
super.notifyChanged(notification);
@@ -173,9 +137,6 @@ public class ConstructionCategoryItemProvider extends ItemProviderAdapter implem
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(BuildingPhysicsPackage.Literals.CONSTRUCTION_CATEGORY__MOUNTINGS,
- BuildingPhysicsFactory.eINSTANCE.createMounting()));
}
/**
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/LayerItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/LayerItemProvider.java
index a01650f..4289849 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/LayerItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/LayerItemProvider.java
@@ -91,17 +91,6 @@ public class LayerItemProvider extends ItemProviderAdapter implements IEditingDo
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
- /**
- * This returns Layer.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/Layer"));
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCatalogItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCatalogItemProvider.java
index b3b1112..b05dcb7 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCatalogItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCatalogItemProvider.java
@@ -2,7 +2,6 @@
*/
package de.hftstuttgart.buildingphysics.provider;
-import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.MaterialCatalog;
@@ -11,9 +10,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -105,13 +102,11 @@ public class MaterialCatalogItemProvider extends CatalogItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated NOT
*/
@Override
public String getText(Object object) {
- String label = ((MaterialCatalog) object).getName();
- return label == null || label.length() == 0 ? getString("_UI_MaterialCatalog_type")
- : getString("_UI_MaterialCatalog_type") + " " + label;
+ return getString("_UI_MaterialCatalog_type");
}
/**
@@ -144,14 +139,6 @@ public class MaterialCatalogItemProvider extends CatalogItemProvider {
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors
- .add(createChildParameter(BuildingPhysicsPackage.Literals.MATERIAL_CATALOG__MATERIAL_CATEGORIES,
- BuildingPhysicsFactory.eINSTANCE.createMaterialCategory()));
-
- newChildDescriptors
- .add(createChildParameter(BuildingPhysicsPackage.Literals.MATERIAL_CATALOG__CONSTRUCTION_CATEGORIES,
- BuildingPhysicsFactory.eINSTANCE.createConstructionCategory()));
}
}
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCategoryItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCategoryItemProvider.java
index b6e1711..248f7eb 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCategoryItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialCategoryItemProvider.java
@@ -2,7 +2,6 @@
*/
package de.hftstuttgart.buildingphysics.provider;
-import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.MaterialCategory;
@@ -13,9 +12,6 @@ import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -77,36 +73,6 @@ public class MaterialCategoryItemProvider extends ItemProviderAdapter implements
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
- /**
- * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
- * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
- * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null) {
- super.getChildrenFeatures(object);
- childrenFeatures.add(BuildingPhysicsPackage.Literals.MATERIAL_CATEGORY__MATERIALS);
- }
- return childrenFeatures;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EStructuralFeature getChildFeature(Object object, Object child) {
- // Check the type of the specified child object and return the proper feature to use for
- // adding (see {@link AddCommand}) it as a child.
-
- return super.getChildFeature(object, child);
- }
-
/**
* This returns MaterialCategory.gif.
* <!-- begin-user-doc -->
@@ -153,12 +119,10 @@ public class MaterialCategoryItemProvider extends ItemProviderAdapter implements
updateChildren(notification);
switch (notification.getFeatureID(MaterialCategory.class)) {
+ case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIALS:
case BuildingPhysicsPackage.MATERIAL_CATEGORY__NAME:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
- case BuildingPhysicsPackage.MATERIAL_CATEGORY__MATERIALS:
- fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
- return;
}
super.notifyChanged(notification);
}
@@ -173,9 +137,6 @@ public class MaterialCategoryItemProvider extends ItemProviderAdapter implements
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(BuildingPhysicsPackage.Literals.MATERIAL_CATEGORY__MATERIALS,
- BuildingPhysicsFactory.eINSTANCE.createMaterial()));
}
/**
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java
index 4dad5f8..a154fb6 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MaterialItemProvider.java
@@ -244,17 +244,6 @@ public class MaterialItemProvider extends ItemProviderAdapter implements IEditin
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
- /**
- * This returns Material.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/Material"));
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MountingItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MountingItemProvider.java
index e94f7b8..881ce36 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MountingItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/MountingItemProvider.java
@@ -124,17 +124,6 @@ public class MountingItemProvider extends ItemProviderAdapter implements IEditin
return super.getChildFeature(object, child);
}
- /**
- * This returns Mounting.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/Mounting"));
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java
index 6c8c85e..94d50a8 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowCatalogItemProvider.java
@@ -2,7 +2,6 @@
*/
package de.hftstuttgart.buildingphysics.provider;
-import de.hftstuttgart.buildingphysics.BuildingPhysicsFactory;
import de.hftstuttgart.buildingphysics.BuildingPhysicsPackage;
import de.hftstuttgart.buildingphysics.WindowCatalog;
@@ -11,9 +10,7 @@ import java.util.List;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
-
import org.eclipse.emf.ecore.EStructuralFeature;
-
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -104,13 +101,11 @@ public class WindowCatalogItemProvider extends CatalogItemProvider {
* This returns the label text for the adapted class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @generated
+ * @generated NOT
*/
@Override
public String getText(Object object) {
- String label = ((WindowCatalog) object).getName();
- return label == null || label.length() == 0 ? getString("_UI_WindowCatalog_type")
- : getString("_UI_WindowCatalog_type") + " " + label;
+ return getString("_UI_WindowCatalog_type");
}
/**
@@ -142,9 +137,6 @@ public class WindowCatalogItemProvider extends CatalogItemProvider {
@Override
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
-
- newChildDescriptors.add(createChildParameter(BuildingPhysicsPackage.Literals.WINDOW_CATALOG__WINDOW_TYPES,
- BuildingPhysicsFactory.eINSTANCE.createWindowType()));
}
}
diff --git a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java
index 6c3af04..fa4c6f6 100644
--- a/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java
+++ b/de.hftstuttgart.buildingphysics.edit/src/de/hftstuttgart/buildingphysics/provider/WindowTypeItemProvider.java
@@ -261,17 +261,6 @@ public class WindowTypeItemProvider extends ItemProviderAdapter implements IEdit
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
- /**
- * This returns WindowType.gif.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/WindowType"));
- }
-
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/ConstructionCategory.view b/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/ConstructionCategory.view
index b5fd397..d94eb26 100644
--- a/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/ConstructionCategory.view
+++ b/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/ConstructionCategory.view
@@ -1,10 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmi:id="__9S1ELPYEeup29SeaUMpQQ" name="ConstructionCategory">
+<org.eclipse.emf.ecp.view.model:View xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.emf.ecp.view.model="http://org/eclipse/emf/ecp/view/model/1180" xmlns:org.eclipse.emf.ecp.view.table.model="http://org/eclipse/emf/ecp/view/table/model/150" xmi:id="__9S1ELPYEeup29SeaUMpQQ" name="ConstructionCategory">
<rootEClass href="http://www.hftstuttgart.de/buildingphysics#//ConstructionCategory"/>
<children xsi:type="org.eclipse.emf.ecp.view.model:Control" xmi:id="__9TcILPYEeup29SeaUMpQQ" name="Control name">
<domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="__9TcIbPYEeup29SeaUMpQQ">
<domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//ConstructionCategory/name"/>
</domainModelReference>
</children>
+ <children xsi:type="org.eclipse.emf.ecp.view.table.model:TableControl" xmi:id="_vgicgLeuEeu0KumwacCHxQ" detailEditing="WithPanel">
+ <domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference" xmi:id="_yN_hQLeuEeu0KumwacCHxQ">
+ <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_yN_hQbeuEeu0KumwacCHxQ">
+ <domainModelEFeature xsi:type="ecore:EReference" href="http://www.hftstuttgart.de/buildingphysics#//ConstructionCategory/mountings"/>
+ </domainModelReference>
+ </domainModelReference>
+ </children>
<ecorePaths>/de.hftstuttgart.buildingphysics/model/buildingphysics.ecore</ecorePaths>
</org.eclipse.emf.ecp.view.model:View>
diff --git a/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowCatalog.view b/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowCatalog.view
index 4239dd6..817c56b 100644
--- a/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowCatalog.view
+++ b/de.hftstuttgart.buildingphysics.viewmodel/viewmodels/WindowCatalog.view
@@ -17,23 +17,8 @@
</domainModelReference>
</children>
<children xsi:type="org.eclipse.emf.ecp.view.table.model:TableControl" xmi:id="_jQX8wK15Eeuda6ijj1ILcQ" detailEditing="WithPanel">
- <domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference" xmi:id="_lX_JgK15Eeuda6ijj1ILcQ">
- <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Fy7TkK22Eeup29SeaUMpQQ">
- <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/id"/>
- </columnDomainModelReferences>
- <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Fy7Tka22Eeup29SeaUMpQQ">
- <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/name"/>
- </columnDomainModelReferences>
- <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Fy7Tkq22Eeup29SeaUMpQQ">
- <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/uValue"/>
- </columnDomainModelReferences>
- <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Fy7Tk622Eeup29SeaUMpQQ">
- <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/gValue"/>
- </columnDomainModelReferences>
- <columnDomainModelReferences xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_Fy7TlK22Eeup29SeaUMpQQ">
- <domainModelEFeature xsi:type="ecore:EAttribute" href="http://www.hftstuttgart.de/buildingphysics#//WindowType/glazingNumber"/>
- </columnDomainModelReferences>
- <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_lX_Jga15Eeuda6ijj1ILcQ">
+ <domainModelReference xsi:type="org.eclipse.emf.ecp.view.table.model:TableDomainModelReference" xmi:id="_v8IfcLfGEeu0KumwacCHxQ">
+ <domainModelReference xsi:type="org.eclipse.emf.ecp.view.model:FeaturePathDomainModelReference" xmi:id="_v8IfcbfGEeu0KumwacCHxQ">
<domainModelEFeature xsi:type="ecore:EReference" href="http://www.hftstuttgart.de/buildingphysics#//WindowCatalog/windowTypes"/>
</domainModelReference>
</domainModelReference>
diff --git a/de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel b/de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel
index 026c8ce..a358986 100644
--- a/de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel
+++ b/de.hftstuttgart.buildingphysics/model/buildingphysics.genmodel
@@ -16,7 +16,7 @@
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/windowCatalog"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//BuildingPhysicsCatalog/materialCatalog"/>
</genClasses>
- <genClasses ecoreClass="buildingphysics.ecore#//WindowType">
+ <genClasses image="false" ecoreClass="buildingphysics.ecore#//WindowType">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/windowTypeId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/name"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/uValue"/>
@@ -30,23 +30,23 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/disposalCarbon"/>
<genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//WindowType/disposalDescription"/>
</genClasses>
- <genClasses ecoreClass="buildingphysics.ecore#//Catalog">
+ <genClasses image="false" ecoreClass="buildingphysics.ecore#//Catalog">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Catalog/name"/>
<genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Catalog/description"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Catalog/source"/>
</genClasses>
<genClasses ecoreClass="buildingphysics.ecore#//WindowCatalog">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//WindowCatalog/windowTypes"/>
+ <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//WindowCatalog/windowTypes"/>
</genClasses>
<genClasses ecoreClass="buildingphysics.ecore#//MaterialCatalog">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCatalog/materialCategories"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCatalog/constructionCategories"/>
+ <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCatalog/materialCategories"/>
+ <genFeatures property="None" children="true" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCatalog/constructionCategories"/>
</genClasses>
<genClasses ecoreClass="buildingphysics.ecore#//MaterialCategory">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCategory/materials"/>
+ <genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//MaterialCategory/materials"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//MaterialCategory/name"/>
</genClasses>
- <genClasses ecoreClass="buildingphysics.ecore#//Material">
+ <genClasses image="false" ecoreClass="buildingphysics.ecore#//Material">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/materialId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/name"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Material/density"/>
@@ -61,14 +61,14 @@
</genClasses>
<genClasses ecoreClass="buildingphysics.ecore#//ConstructionCategory">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//ConstructionCategory/name"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//ConstructionCategory/mountings"/>
+ <genFeatures property="None" createChild="false" ecoreFeature="ecore:EReference buildingphysics.ecore#//ConstructionCategory/mountings"/>
</genClasses>
- <genClasses ecoreClass="buildingphysics.ecore#//Mounting">
+ <genClasses image="false" ecoreClass="buildingphysics.ecore#//Mounting">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Mounting/mountingId"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Mounting/name"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Mounting/layers"/>
</genClasses>
- <genClasses ecoreClass="buildingphysics.ecore#//Layer">
+ <genClasses image="false" ecoreClass="buildingphysics.ecore#//Layer">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference buildingphysics.ecore#//Layer/material"
suppressedGetVisibility="false" suppressedSetVisibility="false"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute buildingphysics.ecore#//Layer/thickness"/>
--
GitLab